diff options
| author | Ananya Sen | 2012-02-29 15:21:31 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-29 15:21:31 -0800 |
| commit | 8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch) | |
| tree | dbd17232983247a38bb6b2cea480242bdf3f2422 /js/controllers/selection-controller.js | |
| parent | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts:
js/controllers/selection-controller.js
js/document/html-document.js
js/panels/properties/content.reel/content.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers/selection-controller.js')
| -rwxr-xr-x | js/controllers/selection-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 184c4899..08eb018f 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
| @@ -99,7 +99,7 @@ exports.SelectionController = Montage.create(Component, { | |||
| 99 | } | 99 | } |
| 100 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); | 100 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); |
| 101 | 101 | ||
| 102 | this._selectionContainer = this.application.ninja.currentSelectedContainer; | 102 | this._selectionContainer = this.application.ninja.currentSelectedContainer; |
| 103 | } | 103 | } |
| 104 | }, | 104 | }, |
| 105 | 105 | ||