diff options
author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /js/components | |
parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components')
-rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.js | 2 | ||||
-rwxr-xr-x | js/components/tree.reel/tree.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js index 8d0cd21f..1e717f88 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.js +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js | |||
@@ -113,7 +113,7 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
113 | 113 | ||
114 | handleChange: { | 114 | handleChange: { |
115 | value: function(event) { | 115 | value: function(event) { |
116 | var hotTxt = event.currentTarget | 116 | var hotTxt = event.currentTarget; |
117 | if(hotTxt.units === "%") { | 117 | if(hotTxt.units === "%") { |
118 | if(hotTxt.value > 50) { | 118 | if(hotTxt.value > 50) { |
119 | hotTxt.maxValue = 50; | 119 | hotTxt.maxValue = 50; |
diff --git a/js/components/tree.reel/tree.js b/js/components/tree.reel/tree.js index 9c1b07e4..7084ba99 100755 --- a/js/components/tree.reel/tree.js +++ b/js/components/tree.reel/tree.js | |||
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | var nj = require("js/lib/NJUtils.js").NJUtils; | 9 | var nj = require("js/lib/NJUtils").NJUtils; |
10 | 10 | ||
11 | exports.Tree = Montage.create(Component, { | 11 | exports.Tree = Montage.create(Component, { |
12 | 12 | ||