aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-04 14:54:35 -0700
committerNivesh Rajbhandari2012-05-04 14:54:35 -0700
commitce2d581894f9e433a7b73e4b622352a657b6ddaa (patch)
treebbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/controllers
parent8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff)
parent8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff)
downloadninja-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')
-rwxr-xr-xjs/controllers/document-controller.js2
-rwxr-xr-xjs/controllers/selection-controller.js1
2 files changed, 1 insertions, 2 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 6d11bd0e..803519a7 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -366,7 +366,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
366 case 'html': 366 case 'html':
367 //Open in designer view 367 //Open in designer view
368 this._hackRootFlag = false; 368 this._hackRootFlag = false;
369 Montage.create(Document).init(doc, this, this._onOpenDocument); 369 Montage.create(Document).init(doc, this, this._onOpenDocument, 'design');
370 break; 370 break;
371 default: 371 default:
372 //Open in code view 372 //Open in code view
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){