mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: Object.assign isn't available to phantom
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user