From e6f9e4ba68d6d3deed4b04427abca1a97320064d Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 26 Jun 2012 13:10:16 -0700 Subject: IKNINJA-1667 - Fix for JIRA issue involving updating rule list on selection change. --- .../css-panel/rule-list-container.reel/rule-list-container.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'js') 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, { value: function(selection) { var list = this._getListForSelection(selection); - if(!list) { + if(list) { + this.displayedList = list; + this.update(); + } else { list = this.add(selection); + this.displayedList = list; } - - this.displayedList = list; } }, -- cgit v1.2.3 From a72b6809e214eb524f866440a55f8366f078c240 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 26 Jun 2012 14:00:59 -0700 Subject: IKNINJA-1659 - Fix error when calling preventDefault() --- .../css-panel/rule-components/css-style-rule.reel/css-style-rule.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'js') 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, { handleStop : { value: function(e) { if(this.focusDelegate) { - e._event.detail.preventDefault(); + if(e._event.detail.preventDefault) { + e._event.detail.preventDefault(); + } + this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this); } } -- cgit v1.2.3 From d8bb1bf1537166753a53000e31ece8f99c7daaaa Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 26 Jun 2012 17:39:46 -0700 Subject: including the map icons inside the component and adding the empty category Signed-off-by: Valerio Virgillito --- js/io/system/ninjalibrary.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') 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 @@ { "libraries": [ - {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"}, + {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"}, {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} ] } \ No newline at end of file -- cgit v1.2.3 From d13d20285df2fcdc9f235ee4246355e955c34619 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 27 Jun 2012 15:18:03 -0700 Subject: Temporarily disable ElementMediator's addDelegate when adding components. Signed-off-by: Nivesh Rajbhandari --- js/panels/components-panel.reel/components-panel.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js') 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, { componentInstanceOnFirstDraw: { value: function(instance) { + var addDelegate = this.application.ninja.elementMediator.addDelegate; + this.application.ninja.elementMediator.addDelegate = null; this.application.ninja.elementMediator.addElements(instance.element); this.application.ninja.currentDocument.model.mObjects.push(instance); + this.application.ninja.elementMediator.addDelegate = addDelegate; } }, -- cgit v1.2.3 From 1e0b05465c120a2b17d0f8420787a1d002e4b28e Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Wed, 27 Jun 2012 21:06:25 -0700 Subject: Timeline: bug fix IKNINJA-1843 --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 50171260..ef13f22e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { currentLayersSelectedLength = this.currentLayersSelected.length, arrLayersLength = this.arrLayers.length, returnVal = arrLayersLength -1; + if (returnVal === -1) { + return false; + } if (this.currentLayersSelected === false) { return false; } -- cgit v1.2.3 From 7e098b5a710776439ca6ad00604e2f2011dbc4ed Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 28 Jun 2012 09:46:23 -0700 Subject: FIX layer selection bug Signed-off-by: Jonathan Duran --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index ef13f22e..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, { for(i=0;i