Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

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

2
app/assets/javascripts/discourse/helpers/raw.js.es6
View File

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