aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-28 13:47:40 -0700
committerArmen Kesablyan2012-06-28 13:47:40 -0700
commitb194664df7e01aaeb8d1e7220a6de0e7f879f1db (patch)
tree833b024473be6ae1d57bdefc434583c49816f79f
parent53b8d67197a63e8c8efce102769dd8947a0eae4b (diff)
parent56d6311f398e04eee3883a5c848fec3b2b53c981 (diff)
downloadninja-b194664df7e01aaeb8d1e7220a6de0e7f879f1db.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js5
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js3
2 files changed, 7 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 50171260..45353a08 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1220,7 +1220,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1220 for(i=0;i<arrSelectedIndexesLength;i++){ 1220 for(i=0;i<arrSelectedIndexesLength;i++){
1221 for(j=0;j<currentLayersSelectedLength;j++){ 1221 for(j=0;j<currentLayersSelectedLength;j++){
1222 1222
1223 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){ 1223 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
1224 matchedValues+=1; 1224 matchedValues+=1;
1225 } 1225 }
1226 } 1226 }
@@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1773 currentLayersSelectedLength = this.currentLayersSelected.length, 1773 currentLayersSelectedLength = this.currentLayersSelected.length,
1774 arrLayersLength = this.arrLayers.length, 1774 arrLayersLength = this.arrLayers.length,
1775 returnVal = arrLayersLength -1; 1775 returnVal = arrLayersLength -1;
1776 if (returnVal === -1) {
1777 return false;
1778 }
1776 if (this.currentLayersSelected === false) { 1779 if (this.currentLayersSelected === false) {
1777 return false; 1780 return false;
1778 } 1781 }
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index ab033433..073a4438 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -300,8 +300,11 @@ exports.ComponentsPanel = Montage.create(Component, {
300 300
301 componentInstanceOnFirstDraw: { 301 componentInstanceOnFirstDraw: {
302 value: function(instance) { 302 value: function(instance) {
303 var addDelegate = this.application.ninja.elementMediator.addDelegate;
304 this.application.ninja.elementMediator.addDelegate = null;
303 this.application.ninja.elementMediator.addElements(instance.element); 305 this.application.ninja.elementMediator.addElements(instance.element);
304 this.application.ninja.currentDocument.model.mObjects.push(instance); 306 this.application.ninja.currentDocument.model.mObjects.push(instance);
307 this.application.ninja.elementMediator.addDelegate = addDelegate;
305 } 308 }
306 }, 309 },
307 310