diff options
| author | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
| commit | ce2d581894f9e433a7b73e4b622352a657b6ddaa (patch) | |
| tree | bbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/controllers/selection-controller.js | |
| parent | 8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff) | |
| parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
| download | ninja-ce2d581894f9e433a7b73e4b622352a657b6ddaa.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Conflicts:
js/document/templates/montage-web/default_html.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers/selection-controller.js')
| -rwxr-xr-x | js/controllers/selection-controller.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 77c065ae..a81cdf7f 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
| @@ -152,7 +152,6 @@ exports.SelectionController = Montage.create(Component, { | |||
| 152 | 152 | ||
| 153 | selectElement: { | 153 | selectElement: { |
| 154 | value: function(element) { | 154 | value: function(element) { |
| 155 | |||
| 156 | if(this.findSelectedElement(element) === -1) { | 155 | if(this.findSelectedElement(element) === -1) { |
| 157 | 156 | ||
| 158 | if(this.application.ninja.currentDocument.inExclusion(element) !== -1){ | 157 | if(this.application.ninja.currentDocument.inExclusion(element) !== -1){ |