diff options
| author | hwc487 | 2012-03-06 16:03:26 -0800 |
|---|---|---|
| committer | hwc487 | 2012-03-06 16:03:26 -0800 |
| commit | 855e8727b147771ff7b05e71bed481e65fe4b6b0 (patch) | |
| tree | 60d7f091fcf0870495aeaa63748492dbd558619d /js/stage/stage-deps.js | |
| parent | 1207735f05f202b5bdc5f70c73445f8e0934a227 (diff) | |
| parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
| download | ninja-855e8727b147771ff7b05e71bed481e65fe4b6b0.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/preloader/Preloader.js
Diffstat (limited to 'js/stage/stage-deps.js')
| -rwxr-xr-x | js/stage/stage-deps.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 16f2c652..a71b77be 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js | |||
| @@ -125,7 +125,7 @@ exports.StageDeps = Montage.create(Component, { | |||
| 125 | handleOpenDocument: { | 125 | handleOpenDocument: { |
| 126 | value: function() { | 126 | value: function() { |
| 127 | 127 | ||
| 128 | workingPlane = Vector.create( [0,0,1,0] ); | 128 | workingPlane = [0,0,1,0]; |
| 129 | 129 | ||
| 130 | snapManager.setCurrentStage(this.currentStage); | 130 | snapManager.setCurrentStage(this.currentStage); |
| 131 | 131 | ||
| @@ -151,7 +151,7 @@ exports.StageDeps = Montage.create(Component, { | |||
| 151 | reinitializeForSwitchDocument: { | 151 | reinitializeForSwitchDocument: { |
| 152 | value: function() { | 152 | value: function() { |
| 153 | 153 | ||
| 154 | workingPlane = Vector.create( [0,0,1,0] ); | 154 | workingPlane = [0,0,1,0]; |
| 155 | 155 | ||
| 156 | snapManager.setCurrentStage(this.currentStage); | 156 | snapManager.setCurrentStage(this.currentStage); |
| 157 | 157 | ||