aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 15:57:43 -0700
committerValerio Virgillito2012-05-03 15:57:43 -0700
commit8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (patch)
treeb053a48b8c835ae9087a97bfdf02746e7b4c3833 /js/controllers
parent602240c38e0f2c3937d3c7246247e0b59bccab2b (diff)
parentf3479e478f3cec1cb00508bedbce8dc5a210931a (diff)
downloadninja-8dcbac5d4c30e9dfbc543a5f997939111e9c9f89.tar.gz
Merge pull request #193 from joseeight/Document
New Document View
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 7795a74d..bb0f542f 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 5665b09c..2bd774f5 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){