aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/undo-controller.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 11:17:41 -0700
committerArmen Kesablyan2012-06-11 11:17:41 -0700
commit278769df00ced8620fd73371e38fe2e43f07ca3b (patch)
treedeb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/controllers/undo-controller.js
parent555fd6efa605b937800b3979a4c68fa7eb8666ae (diff)
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
downloadninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/controllers/undo-controller.js')
-rwxr-xr-xjs/controllers/undo-controller.js8
1 files changed, 0 insertions, 8 deletions
diff --git a/js/controllers/undo-controller.js b/js/controllers/undo-controller.js
index 19cfb6e6..8514df3d 100755
--- a/js/controllers/undo-controller.js
+++ b/js/controllers/undo-controller.js
@@ -113,20 +113,12 @@ exports.UndoController = Montage.create( Component, {
113 113
114 deserializedFromTemplate: { 114 deserializedFromTemplate: {
115 value: function(){ 115 value: function(){
116 this.eventManager.addEventListener( "openDocument", this, false);
117 this.eventManager.addEventListener( "sendToUndo", this, false); 116 this.eventManager.addEventListener( "sendToUndo", this, false);
118 this.eventManager.addEventListener( "executeUndo", this, false); 117 this.eventManager.addEventListener( "executeUndo", this, false);
119 this.eventManager.addEventListener( "executeRedo", this, false); 118 this.eventManager.addEventListener( "executeRedo", this, false);
120 } 119 }
121 }, 120 },
122 121
123 handleOpenDocument: {
124 value: function(undoQueue, redoQueue) {
125// this._undoQueue = undoQueue;
126// this._redoQueue = redoQueue;
127 }
128 },
129
130 handleSendToUndo: { 122 handleSendToUndo: {
131 value: function(event) { 123 value: function(event) {
132 this.undoQueue.push(event.detail); 124 this.undoQueue.push(event.detail);