From 5a34cac9594d710f6e5675bee34dc16be1b4d8a0 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 16 Jul 2012 15:34:07 -0700 Subject: Fixed copy paste from external applications Signed-off-by: Ananya Sen --- js/mediators/element-mediator.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/mediators') diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index 9c9518a0..4a4c9f88 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js @@ -49,7 +49,7 @@ exports.ElementMediator = Montage.create(Component, { }, addElements:{ - value:function (elements, rules, notify) { + value:function (elements, rules, notify, callAddDelegate) { if (Array.isArray(elements)) { elements.forEach(function (element) { ElementController.addElement(element, rules); @@ -61,7 +61,9 @@ exports.ElementMediator = Montage.create(Component, { } - if (this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") { + if ((callAddDelegate || (typeof callAddDelegate === "undefined")) + && this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") { + this.addDelegate['onAddElements'].call(this.addDelegate, elements); } -- cgit v1.2.3 From 16d06bac95ce8334f8c5586750e98360dbc9cbd9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 18 Jul 2012 22:50:12 -0700 Subject: Fixing chrome preview shortcut The menu update broke the chrome preview shortcut. Updated the function name in the keyboard handler. Signed-off-by: Valerio Virgillito --- js/mediators/keyboard-mediator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/mediators') diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 36bc86fd..f71356b6 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js @@ -264,7 +264,7 @@ exports.KeyboardMediator = Montage.create(Component, { if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) { - this.application.ninja.executeChromePreview(); + this.application.ninja.handleExecutePreview(); return; } -- cgit v1.2.3