diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/document/controllers | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document/controllers')
| -rwxr-xr-x | js/document/controllers/document.js | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/js/document/controllers/document.js b/js/document/controllers/document.js index 1b1e1b85..d897934a 100755 --- a/js/document/controllers/document.js +++ b/js/document/controllers/document.js | |||
| @@ -30,40 +30,40 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 30 | 30 | ||
| 31 | //////////////////////////////////////////////////////////////////////// | 31 | //////////////////////////////////////////////////////////////////////// |
| 32 | // | 32 | // |
| 33 | var Montage = require("montage/core/core").Montage, | 33 | var Montage = require("montage/core/core").Montage, |
| 34 | Component = require("montage/ui/component").Component; | 34 | Component = require("montage/ui/component").Component; |
| 35 | //////////////////////////////////////////////////////////////////////// | 35 | //////////////////////////////////////////////////////////////////////// |
| 36 | // | 36 | // |
| 37 | exports.DocumentController = Montage.create(Component, { | 37 | exports.DocumentController = Montage.create(Component, { |
| 38 | //////////////////////////////////////////////////////////////////// | 38 | //////////////////////////////////////////////////////////////////// |
| 39 | // | 39 | // |
| 40 | hasTemplate: { | 40 | hasTemplate: { |
| 41 | enumerable: false, | 41 | enumerable: false, |
| 42 | value: false | 42 | value: false |
| 43 | }, | 43 | }, |
| 44 | //////////////////////////////////////////////////////////////////// | 44 | //////////////////////////////////////////////////////////////////// |
| 45 | // | 45 | // |
| 46 | save: { | 46 | save: { |
| 47 | value: function () { | 47 | value: function () { |
| 48 | // | 48 | // |
| 49 | } | 49 | } |
| 50 | }, | 50 | }, |
| 51 | //////////////////////////////////////////////////////////////////// | 51 | //////////////////////////////////////////////////////////////////// |
| 52 | // | 52 | // |
| 53 | saveAs: { | 53 | saveAs: { |
| 54 | value: function () { | 54 | value: function () { |
| 55 | // | 55 | // |
| 56 | } | 56 | } |
| 57 | }, | 57 | }, |
| 58 | //////////////////////////////////////////////////////////////////// | 58 | //////////////////////////////////////////////////////////////////// |
| 59 | // | 59 | // |
| 60 | close: { | 60 | close: { |
| 61 | value: function () { | 61 | value: function () { |
| 62 | // | 62 | // |
| 63 | } | 63 | } |
| 64 | } | 64 | } |
| 65 | //////////////////////////////////////////////////////////////////// | 65 | //////////////////////////////////////////////////////////////////// |
| 66 | //////////////////////////////////////////////////////////////////// | 66 | //////////////////////////////////////////////////////////////////// |
| 67 | }); | 67 | }); |
| 68 | //////////////////////////////////////////////////////////////////////// | 68 | //////////////////////////////////////////////////////////////////////// |
| 69 | //////////////////////////////////////////////////////////////////////// | 69 | //////////////////////////////////////////////////////////////////////// |