aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorKruti Shah2012-07-19 10:08:07 -0700
committerKruti Shah2012-07-19 10:08:07 -0700
commit5741fbc0a2eb1a43017b76406056bc98cdf00297 (patch)
treec6b478666eab9e637039467d70e948e1e0e46882 /js/mediators
parent0b899ad6cec5e4626dfa32230be7c04d22d4f820 (diff)
parent142dc59794769ad783ab050b27b4f56ac5773afb (diff)
downloadninja-5741fbc0a2eb1a43017b76406056bc98cdf00297.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/element-mediator.js6
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
2 files changed, 5 insertions, 3 deletions
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, {
49 }, 49 },
50 50
51 addElements:{ 51 addElements:{
52 value:function (elements, rules, notify) { 52 value:function (elements, rules, notify, callAddDelegate) {
53 if (Array.isArray(elements)) { 53 if (Array.isArray(elements)) {
54 elements.forEach(function (element) { 54 elements.forEach(function (element) {
55 ElementController.addElement(element, rules); 55 ElementController.addElement(element, rules);
@@ -61,7 +61,9 @@ exports.ElementMediator = Montage.create(Component, {
61 61
62 } 62 }
63 63
64 if (this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") { 64 if ((callAddDelegate || (typeof callAddDelegate === "undefined"))
65 && this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
66
65 this.addDelegate['onAddElements'].call(this.addDelegate, elements); 67 this.addDelegate['onAddElements'].call(this.addDelegate, elements);
66 } 68 }
67 69
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, {
264 264
265 265
266 if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) { 266 if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) {
267 this.application.ninja.executeChromePreview(); 267 this.application.ninja.handleExecutePreview();
268 return; 268 return;
269 } 269 }
270 270