diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/core/undo-manager.js | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/core/undo-manager.js')
-rw-r--r-- | node_modules/montage/core/undo-manager.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/node_modules/montage/core/undo-manager.js b/node_modules/montage/core/undo-manager.js index cd97ee59..7335df77 100644 --- a/node_modules/montage/core/undo-manager.js +++ b/node_modules/montage/core/undo-manager.js | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | var Montage = require("montage").Montage; | 9 | var Montage = require("montage").Montage; |
10 | 10 | ||
11 | exports.UndoManager = Montage.create(Montage, { | 11 | var UndoManager = exports.UndoManager = Montage.create(Montage, { |
12 | 12 | ||
13 | enabled: { | 13 | enabled: { |
14 | value: true | 14 | value: true |
@@ -238,3 +238,13 @@ exports.UndoManager = Montage.create(Montage, { | |||
238 | } | 238 | } |
239 | 239 | ||
240 | }); | 240 | }); |
241 | |||
242 | var _defaultUndoManager = null; | ||
243 | Montage.defineProperty(exports, "defaultUndoManager", { | ||
244 | get: function() { | ||
245 | if (!_defaultUndoManager) { | ||
246 | _defaultUndoManager = UndoManager.create(); | ||
247 | } | ||
248 | return _defaultUndoManager; | ||
249 | } | ||
250 | }); | ||