diff options
author | Nivesh Rajbhandari | 2012-05-24 13:54:00 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-24 13:54:00 -0700 |
commit | fd4af6d81725dfa0630ac5e52ba95405336f4074 (patch) | |
tree | 868197f79862e98b9c7f5a1f296d64832c68d48f /js/controllers/selection-controller.js | |
parent | de25d2b7d05476d4f0d385b5e910db189f682d21 (diff) | |
parent | 70ff8dd670bc37c14caf850e06791d1e293b1e4b (diff) | |
download | ninja-fd4af6d81725dfa0630ac5e52ba95405336f4074.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/controllers/selection-controller.js')
-rwxr-xr-x | js/controllers/selection-controller.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 214b9032..75bffc5c 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -113,7 +113,7 @@ exports.SelectionController = Montage.create(Component, { | |||
113 | value: function(event) { | 113 | value: function(event) { |
114 | var selected = [], childNodes = [], self = this; | 114 | var selected = [], childNodes = [], self = this; |
115 | 115 | ||
116 | childNodes = this.application.ninja.currentDocument.documentRoot.childNodes; | 116 | childNodes = this.application.ninja.currentDocument.model.documentRoot.childNodes; |
117 | childNodes = Array.prototype.slice.call(childNodes, 0); | 117 | childNodes = Array.prototype.slice.call(childNodes, 0); |
118 | childNodes.forEach(function(item) { | 118 | childNodes.forEach(function(item) { |
119 | if(self.isNodeTraversable(item)) { | 119 | if(self.isNodeTraversable(item)) { |
@@ -255,10 +255,10 @@ exports.SelectionController = Montage.create(Component, { | |||
255 | 255 | ||
256 | for(var i=0, uuid; this.application.ninja.selectedElements[i];i++) { | 256 | for(var i=0, uuid; this.application.ninja.selectedElements[i];i++) { |
257 | // Check for multiple selection and excluding inner elements | 257 | // Check for multiple selection and excluding inner elements |
258 | if(item.parentNode && item.parentNode !== this.application.ninja.currentDocument.documentRoot) { | 258 | if(item.parentNode && item.parentNode !== this.application.ninja.currentDocument.model.documentRoot) { |
259 | var outerElement = item.parentNode; | 259 | var outerElement = item.parentNode; |
260 | 260 | ||
261 | while(outerElement.parentNode && outerElement.parentNode !== this.application.ninja.currentDocument.documentRoot) { | 261 | while(outerElement.parentNode && outerElement.parentNode !== this.application.ninja.currentDocument.model.documentRoot) { |
262 | outerElement = outerElement.parentNode; | 262 | outerElement = outerElement.parentNode; |
263 | } | 263 | } |
264 | 264 | ||