diff options
| author | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
| commit | 5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb (patch) | |
| tree | af71b72b828d942ebf11f565b7c9ccff0798343d /js/controllers/objects-controller.js | |
| parent | 8966fc4903f0eec61816d9b9bdbcac9b7d99c320 (diff) | |
| parent | 526b9d76686323f488f1b26175440172b715d808 (diff) | |
| download | ninja-5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb.tar.gz | |
Merge branch 'refs/heads/master' into GIO-TextTool
Diffstat (limited to 'js/controllers/objects-controller.js')
| -rw-r--r-- | js/controllers/objects-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js index f6d400f4..6ca869ba 100644 --- a/js/controllers/objects-controller.js +++ b/js/controllers/objects-controller.js | |||
| @@ -27,7 +27,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, { | |||
| 27 | setTimeout(function() { | 27 | setTimeout(function() { |
| 28 | this.bindToModelObjects(); | 28 | this.bindToModelObjects(); |
| 29 | }.bind(this), 1000); | 29 | }.bind(this), 1000); |
| 30 | 30 | this.currentObjectBindings = []; | |
| 31 | this._currentDocument = doc; | 31 | this._currentDocument = doc; |
| 32 | }, | 32 | }, |
| 33 | enumerable : false | 33 | enumerable : false |