aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/document-html.js9
-rwxr-xr-xjs/document/html-document.js10
-rwxr-xr-xjs/document/templates/montage-web/default_html.css2
-rwxr-xr-xjs/document/templates/montage-web/index.html2
4 files changed, 17 insertions, 6 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 8cb88516..24eb4f47 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -270,7 +270,8 @@ exports.HtmlDocument = Montage.create(Component, {
270 270
271 //TODO Finish this implementation once we start caching Core Elements 271 //TODO Finish this implementation once we start caching Core Elements
272 // Assign a model to the UserContent and add the ViewPort reference to it. 272 // Assign a model to the UserContent and add the ViewPort reference to it.
273 document.application.njUtils.makeElementModel(this.documentRoot, "Stage", "stage"); 273 document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
274// this.documentRoot.elementModel.props3D.init(this.documentRoot, true);
274 275
275 for(i = 0; i < this._stylesheets.length; i++) { 276 for(i = 0; i < this._stylesheets.length; i++) {
276 if(this._stylesheets[i].ownerNode.id === "nj-stage-stylesheet") { 277 if(this._stylesheets[i].ownerNode.id === "nj-stage-stylesheet") {
@@ -309,6 +310,12 @@ exports.HtmlDocument = Montage.create(Component, {
309 } 310 }
310 }, 311 },
311 312
313 GetElementFromPoint: {
314 value: function(x, y) {
315 return this._window.getElement(x,y);
316 }
317 },
318
312 // Handler for user content main reel. Gets called once the main reel of the template 319 // Handler for user content main reel. Gets called once the main reel of the template
313 // gets deserialized. 320 // gets deserialized.
314 // Setting up the currentSelectedContainer to the document body. 321 // Setting up the currentSelectedContainer to the document body.
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 3876670c..3dbf96ce 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -759,10 +759,14 @@ exports.HTMLDocument = Montage.create(TextDocument, {
759 //TODO Finish this implementation once we start caching Core Elements 759 //TODO Finish this implementation once we start caching Core Elements
760 // Assign a model to the UserContent and add the ViewPort reference to it. 760 // Assign a model to the UserContent and add the ViewPort reference to it.
761 NJUtils.makeElementModel(this.documentRoot, "Stage", "stage"); 761 NJUtils.makeElementModel(this.documentRoot, "Stage", "stage");
762 //this.documentRoot.elementModel.viewPort = this.iframe.contentWindow.document.getElementById("Viewport"); 762 NJUtils.makeElementModel(this.stageBG, "Stage", "stage");
763 NJUtils.makeElementModel(this.stageBG, "Stage", "stage");
764 NJUtils.makeElementModel(this.iframe.contentWindow.document.getElementById("Viewport"), "Stage", "stage"); 763 NJUtils.makeElementModel(this.iframe.contentWindow.document.getElementById("Viewport"), "Stage", "stage");
765 764
765 // Initialize the 3D properties
766 this.documentRoot.elementModel.props3D.init(this.documentRoot, true);
767 this.stageBG.elementModel.props3D.init(this.stageBG, true);
768 this.iframe.contentWindow.document.getElementById("Viewport").elementModel.props3D.init(this.iframe.contentWindow.document.getElementById("Viewport"), true);
769
766 for(i = 0; i < this._stylesheets.length; i++) { 770 for(i = 0; i < this._stylesheets.length; i++) {
767 if(this._stylesheets[i].ownerNode.id === this._stageStyleSheetId) { 771 if(this._stylesheets[i].ownerNode.id === this._stageStyleSheetId) {
768 this.documentRoot.elementModel.defaultRule = this._stylesheets[i]; 772 this.documentRoot.elementModel.defaultRule = this._stylesheets[i];
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
index db069d4e..08e39f22 100755
--- a/js/document/templates/montage-web/default_html.css
+++ b/js/document/templates/montage-web/default_html.css
@@ -11,7 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
11} 11}
12 12
13.active-element-outline { 13.active-element-outline {
14 outline: #adff2f solid 2px; 14 outline: #adff2f solid 2px;
15} 15}
16 16
17.nj-preset-transition { 17.nj-preset-transition {
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 90b0f7fd..c52a5394 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -42,7 +42,7 @@
42 42
43 <body> 43 <body>
44 44
45 <div>IPSUM</div> 45 <!--<div>IPSUM</div>-->
46 46
47 </body> 47 </body>
48 48