aboutsummaryrefslogtreecommitdiff
path: root/js/document/document-html.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-02 11:53:56 -0700
committerJose Antonio Marquez2012-05-02 11:53:56 -0700
commit0df733dd19dc009f3274269dff970e9130ab48b4 (patch)
tree38448e906ac0f0400a72c507473b9ac6e1089f6f /js/document/document-html.js
parentba7946e8b41430eda7e2956ee4c82fa1f1ee9507 (diff)
downloadninja-0df733dd19dc009f3274269dff970e9130ab48b4.tar.gz
Partial URL parsing
Added temporary URL parsing to document assets. (head and body)
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-xjs/document/document-html.js18
1 files changed, 2 insertions, 16 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js
index b169e046..ec59c3e2 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -59,7 +59,7 @@ exports.HtmlDocument = Montage.create(Component, {
59 // 59 //
60 init: { 60 init: {
61 value:function(file, context, callback, view) { 61 value:function(file, context, callback, view) {
62 // 62 //Storing callback data for loaded dispatch
63 this.loaded.callback = callback; 63 this.loaded.callback = callback;
64 this.loaded.context = context; 64 this.loaded.context = context;
65 //Creating instance of HTML Document Model 65 //Creating instance of HTML Document Model
@@ -295,11 +295,6 @@ exports.HtmlDocument = Montage.create(Component, {
295 //////////////////////////////////////////////////////////////////////////// 295 ////////////////////////////////////////////////////////////////////////////
296 //////////////////////////////////////////////////////////////////////////// 296 ////////////////////////////////////////////////////////////////////////////
297 297
298 //TODO Finish this implementation once we start caching Core Elements
299 // Assign a model to the UserContent and add the ViewPort reference to it.
300 document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
301// this.documentRoot.elementModel.props3D.init(this.documentRoot, true);
302
303 for(i = 0; i < this._stylesheets.length; i++) { 298 for(i = 0; i < this._stylesheets.length; i++) {
304 if(this._stylesheets[i].ownerNode.id === "nj-stage-stylesheet") { 299 if(this._stylesheets[i].ownerNode.id === "nj-stage-stylesheet") {
305 this.documentRoot.elementModel.defaultRule = this._stylesheets[i]; 300 this.documentRoot.elementModel.defaultRule = this._stylesheets[i];
@@ -314,16 +309,7 @@ exports.HtmlDocument = Montage.create(Component, {
314 this.documentRoot.elementModel.transitionStopRule = this.documentRoot.elementModel.defaultRule.cssRules[j]; 309 this.documentRoot.elementModel.transitionStopRule = this.documentRoot.elementModel.defaultRule.cssRules[j];
315 } 310 }
316 } 311 }
317 312
318
319 this.loadDelegate.call(this.delegateContext, this);
320
321 //Setting webGL data
322 /*
323 if (this._templateDocument.webgl) {
324 this.glData = this._templateDocument.webgl;
325 }
326 */
327 } 313 }
328 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 314 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
329 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 315 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////