diff options
author | hwc487 | 2012-02-27 13:41:31 -0800 |
---|---|---|
committer | hwc487 | 2012-02-27 13:41:31 -0800 |
commit | 124ad4709780013615d2ff1da05ace9887ee7709 (patch) | |
tree | e8de66216e338f4cba1a98c3a00473ead3daef9d /js | |
parent | a8bd1585ae83d4d304b9f9f41823bb3dcbff9e01 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-124ad4709780013615d2ff1da05ace9887ee7709.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'js')
44 files changed, 286 insertions, 55 deletions
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index 1d0ad776..9c8946c4 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.js | |||
@@ -1,3 +1,9 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
1 | /* ComputedStyleSubPanel.js */ | 7 | /* ComputedStyleSubPanel.js */ |
2 | var Montage = require("montage").Montage, | 8 | var Montage = require("montage").Montage, |
3 | Component = require("montage/ui/component").Component; | 9 | Component = require("montage/ui/component").Component; |
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js index 79813c92..5ed46b3c 100644 --- a/js/components/hintable.reel/hintable.js +++ b/js/components/hintable.reel/hintable.js | |||
@@ -1,3 +1,9 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
1 | /* ComputedStyleSubPanel.js */ | 7 | /* ComputedStyleSubPanel.js */ |
2 | var Montage = require("montage").Montage, | 8 | var Montage = require("montage").Montage, |
3 | Component = require("montage/ui/component").Component, | 9 | Component = require("montage/ui/component").Component, |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 1290aaac..1824c7c3 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
@@ -1,3 +1,8 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
1 | 6 | ||
2 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
3 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component; |
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
@@ -153,21 +153,21 @@ exports.ToolsData = Montage.create(Montage, { | |||
153 | "action": "FillTool", | 153 | "action": "FillTool", |
154 | "toolTip": "Fill Tool", | 154 | "toolTip": "Fill Tool", |
155 | "cursor": "url('images/tools/bucket_down.png'), default", | 155 | "cursor": "url('images/tools/bucket_down.png'), default", |
156 | "lastInGroup": false, | ||
157 | "container": false, | ||
158 | "selected": false | ||
159 | }, | ||
160 | { | ||
161 | "id": "InkBottleTool", | ||
162 | "properties": "inkbottleProperties", | ||
163 | "spriteSheet": true, | ||
164 | "action": "InkBottleTool", | ||
165 | "toolTip": "Ink Bottle Tool", | ||
166 | "cursor": "url('images/tools/inkbottle_down.png'), default", | ||
156 | "lastInGroup": true, | 167 | "lastInGroup": true, |
157 | "container": false, | 168 | "container": false, |
158 | "selected": false | 169 | "selected": false |
159 | }, | 170 | }, |
160 | // { | ||
161 | // "id": "InkBottleTool", | ||
162 | // "properties": "inkbottleProperties", | ||
163 | // "spriteSheet": true, | ||
164 | // "action": "InkBottleTool", | ||
165 | // "toolTip": "Ink Bottle Tool", | ||
166 | // "cursor": "url('images/tools/inkbottle_down.png'), default", | ||
167 | // "lastInGroup": false, | ||
168 | // "container": false, | ||
169 | // "selected": false | ||
170 | // }, | ||
171 | { | 171 | { |
172 | "id": "EyedropperTool", | 172 | "id": "EyedropperTool", |
173 | "properties": "eyedropperProperties", | 173 | "properties": "eyedropperProperties", |
diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js index e075dd3d..cb172bf7 100755 --- a/js/helper-classes/3D/LinePlaneIntersectRec.js +++ b/js/helper-classes/3D/LinePlaneIntersectRec.js | |||
@@ -42,9 +42,6 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object | |||
42 | setDeltaVis: { value: function(d) { this._deltaVis = d; } }, | 42 | setDeltaVis: { value: function(d) { this._deltaVis = d; } }, |
43 | getDeltaVis: { value: function() { return this._deltaVis; } }, | 43 | getDeltaVis: { value: function() { return this._deltaVis; } }, |
44 | 44 | ||
45 | getElementPlanes: { value: function() { return this._deltaVis; } }, | ||
46 | setElementPlanes: { value: function(p) { this._elementPlanes = p; } }, | ||
47 | |||
48 | setNext: { value: function(n) { this._next = n; } }, | 45 | setNext: { value: function(n) { this._next = n; } }, |
49 | getNext: { value: function() { return this._next; } }, | 46 | getNext: { value: function() { return this._next; } }, |
50 | 47 | ||
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js index 5546cc5a..2c60adc6 100755 --- a/js/helper-classes/3D/hit-record.js +++ b/js/helper-classes/3D/hit-record.js | |||
@@ -139,12 +139,10 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype, | |||
139 | 139 | ||
140 | isSomeGridTypeSnap : { | 140 | isSomeGridTypeSnap : { |
141 | value: function() { | 141 | value: function() { |
142 | return | 142 | return ((this._type == this.SNAP_TYPE_GRID_VERTEX) || |
143 | ( | ||
144 | (this._type == this.SNAP_TYPE_GRID_VERTEX) || | ||
145 | (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) || | 143 | (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) || |
146 | (this._type == this.SNAP_TYPE_GRID_VERTICAL) | 144 | (this._type == this.SNAP_TYPE_GRID_VERTICAL) |
147 | ) | 145 | ); |
148 | } | 146 | } |
149 | }, | 147 | }, |
150 | 148 | ||
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index a4bf9baa..5b044f8a 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -165,14 +165,14 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
165 | // Hand tool | 165 | // Hand tool |
166 | if(evt.keyCode === Keyboard.H ) { | 166 | if(evt.keyCode === Keyboard.H ) { |
167 | evt.preventDefault(); | 167 | evt.preventDefault(); |
168 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]}); | 168 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); |
169 | return; | 169 | return; |
170 | } | 170 | } |
171 | 171 | ||
172 | // Zoom tool | 172 | // Zoom tool |
173 | if(evt.keyCode === Keyboard.Z ) { | 173 | if(evt.keyCode === Keyboard.Z ) { |
174 | evt.preventDefault(); | 174 | evt.preventDefault(); |
175 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); | 175 | this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]}); |
176 | return; | 176 | return; |
177 | } | 177 | } |
178 | 178 | ||
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index d286d84c..5de884a9 100644 --- a/js/panels/Timeline/Collapser.js +++ b/js/panels/Timeline/Collapser.js | |||
@@ -1,3 +1,9 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||