FIX: `Object.assign` isn't available to phantom

This commit is contained in:
Robin Ward 2016-12-12 15:23:52 -05:00
parent c2462e1f2d
commit 749f7071f3
2 changed files with 1 additions and 2 deletions

View File

@ -267,7 +267,6 @@ export default Ember.Controller.extend({
},
showOptions(toolbarEvent, loc) {
console.log("opts", JSON.stringify(toolbarEvent.selected));
this.set('toolbarEvent', toolbarEvent);
this.appEvents.trigger('popup-menu:open', loc);
this.set('optionsVisible', true);

View File

@ -3,7 +3,7 @@ import { registerUnbound } from 'discourse-common/lib/helpers';
let _injections;
function renderRaw(ctx, container, template, templateName, params) {
params = Object.assign({}, params);
params = jQuery.extend({}, params);
params.parent = params.parent || ctx;
if (!params.view) {