aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-04 16:00:14 -0700
committerNivesh Rajbhandari2012-05-04 16:00:14 -0700
commitefe62dff2ba6894551fb9679d150255bae5af36e (patch)
tree4b29f6169b4192e5c53836560b43675b9c978255 /js
parentad94ec51c81badeba2b0f870cad8a0eec7878ebd (diff)
downloadninja-efe62dff2ba6894551fb9679d150255bae5af36e.tar.gz
Draw 3d grid by default since app model is not hooked up yet.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/document/document-html.js10
-rwxr-xr-xjs/document/models/html.js4
-rwxr-xr-xjs/document/views/design.js2
3 files changed, 13 insertions, 3 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index deca9f83..f3c135ed 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -41,7 +41,7 @@ exports.HtmlDocument = Montage.create(Component, {
41 //////////////////////////////////////////////////////////////////// 41 ////////////////////////////////////////////////////////////////////
42 // 42 //
43 exclusionList: { 43 exclusionList: {
44 value: [] //TODO: Update to correct list 44 value: ["HTML", "BODY"] //TODO: Update to correct list
45 }, 45 },
46 //////////////////////////////////////////////////////////////////// 46 ////////////////////////////////////////////////////////////////////
47 // 47 //
@@ -73,7 +73,7 @@ exports.HtmlDocument = Montage.create(Component, {
73 views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic 73 views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
74 }); 74 });
75 //Initiliazing views and hiding 75 //Initiliazing views and hiding
76 if (this.model.views.design.initiliaze(document.getElementById("iframeContainer"))) { 76 if (this.model.views.design.initialize(document.getElementById("iframeContainer"))) {
77 //Hiding iFrame, just initiliazing 77 //Hiding iFrame, just initiliazing
78 this.model.views.design.hide(); 78 this.model.views.design.hide();
79 } else { 79 } else {
@@ -115,6 +115,12 @@ exports.HtmlDocument = Montage.create(Component, {
115 this.loaded.callback.call(this.loaded.context, this); 115 this.loaded.callback.call(this.loaded.context, this);
116 //Setting opacity to be viewable after load 116 //Setting opacity to be viewable after load
117 this.model.views.design.iframe.style.opacity = 1; 117 this.model.views.design.iframe.style.opacity = 1;
118
119
120
121
122
123 this.application.ninja.appModel.show3dGrid = true;
118 } 124 }
119 } 125 }
120 //////////////////////////////////////////////////////////////////// 126 ////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/html.js b/js/document/models/html.js
index f45a0e21..5eedb731 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -15,6 +15,10 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
15 // 15 //
16 hasTemplate: { 16 hasTemplate: {
17 value: false 17 value: false
18 },
19
20 draw3DGrid: {
21 value: false
18 } 22 }
19 //////////////////////////////////////////////////////////////////// 23 ////////////////////////////////////////////////////////////////////
20 //////////////////////////////////////////////////////////////////// 24 ////////////////////////////////////////////////////////////////////
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 4f598305..6cce229c 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -49,7 +49,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
49 }, 49 },
50 //////////////////////////////////////////////////////////////////// 50 ////////////////////////////////////////////////////////////////////
51 // 51 //
52 initiliaze: { 52 initialize: {
53 value: function (parent) { 53 value: function (parent) {
54 //Creating iFrame for view 54 //Creating iFrame for view
55 this.iframe = document.createElement("iframe"); 55 this.iframe = document.createElement("iframe");