aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/io/system/ninjalibrary.json2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js8
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js3
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js5
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js8
5 files changed, 21 insertions, 5 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 579264cb..c5ccbc82 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 87cf1e4f..3d31a50b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1233,6 +1233,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1233 } 1233 }
1234 } 1234 }
1235 1235
1236 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
1237 matchedValues+=1;
1238 }
1239 }
1240 }
1236 1241
1237 1242
1238 // TODO: this should probably check to see if it actually needs to run. 1243 // TODO: this should probably check to see if it actually needs to run.
@@ -1792,6 +1797,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1792 currentLayersSelectedLength = this.currentLayersSelected.length, 1797 currentLayersSelectedLength = this.currentLayersSelected.length,
1793 arrLayersLength = this.arrLayers.length, 1798 arrLayersLength = this.arrLayers.length,
1794 returnVal = arrLayersLength -1; 1799 returnVal = arrLayersLength -1;
1800 if (returnVal === -1) {
1801 return false;
1802 }
1795 if (this.currentLayersSelected === false) { 1803 if (this.currentLayersSelected === false) {
1796 return false; 1804 return false;
1797 } 1805 }
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
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
index 5361e5cc..d86c8d55 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
@@ -96,7 +96,10 @@ exports.CssStyleRule = Montage.create(Component, {
96 handleStop : { 96 handleStop : {
97 value: function(e) { 97 value: function(e) {
98 if(this.focusDelegate) { 98 if(this.focusDelegate) {
99 e._event.detail.preventDefault(); 99 if(e._event.detail.preventDefault) {
100 e._event.detail.preventDefault();
101 }
102
100 this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this); 103 this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this);
101 } 104 }
102 } 105 }
diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
index 509ca565..f53937e6 100644
--- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
+++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
@@ -39,11 +39,13 @@ exports.RuleListContainer = Montage.create(Component, {
39 value: function(selection) { 39 value: function(selection) {
40 var list = this._getListForSelection(selection); 40 var list = this._getListForSelection(selection);
41 41
42 if(!list) { 42 if(list) {
43 this.displayedList = list;
44 this.update();
45 } else {
43 list = this.add(selection); 46 list = this.add(selection);
47 this.displayedList = list;
44 } 48 }
45
46 this.displayedList = list;
47 } 49 }
48 }, 50 },
49 51