diff options
author | Kruti Shah | 2012-06-28 09:24:03 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-28 09:24:03 -0700 |
commit | 8aef94d26e172785463161899dfcc877b4233bdb (patch) | |
tree | a9d5ff91681aa06bf26cb62994461a58d3f80005 /js | |
parent | deefd070e5e6e793eef2c3d937e7b1a97b0f6830 (diff) | |
parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
download | ninja-8aef94d26e172785463161899dfcc877b4233bdb.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js')
7 files changed, 18 insertions, 5 deletions
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html index 773baa03..037c1197 100755 --- a/js/document/templates/banner/index.html +++ b/js/document/templates/banner/index.html | |||
@@ -18,6 +18,7 @@ | |||
18 | 18 | ||
19 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> | 19 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> |
20 | * { | 20 | * { |
21 | -webkit-animation: none !important; | ||
21 | -webkit-transition-duration: 0s !important; | 22 | -webkit-transition-duration: 0s !important; |
22 | -webkit-animation-duration: 0s !important; | 23 | -webkit-animation-duration: 0s !important; |
23 | -webkit-animation-name: none !important; | 24 | -webkit-animation-name: none !important; |
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html index d7a44129..ef68a3c0 100755 --- a/js/document/templates/html/index.html +++ b/js/document/templates/html/index.html | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> | 22 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> |
23 | * { | 23 | * { |
24 | -webkit-animation: none !important; | ||
24 | -webkit-transition-duration: 0s !important; | 25 | -webkit-transition-duration: 0s !important; |
25 | -webkit-animation-duration: 0s !important; | 26 | -webkit-animation-duration: 0s !important; |
26 | -webkit-animation-name: none !important; | 27 | -webkit-animation-name: none !important; |
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 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, { | |||
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 | ||
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 | ||