From 6a0f150f49be656e0725bc77b452a3141dddd47c Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Wed, 6 Jun 2012 13:46:02 -0700 Subject: Cleaning up Removed reference of model in design view, clean up slightly, need to implement binding later. --- js/document/document-html.js | 4 +++- js/document/models/base.js | 37 ++++++++++++++++++++--------------- js/document/models/html.js | 25 ++++++++++++++---------- js/document/views/design.js | 46 +++++++++++++++++++++++++++++++------------- 4 files changed, 72 insertions(+), 40 deletions(-) (limited to 'js/document') diff --git a/js/document/document-html.js b/js/document/document-html.js index 33a41a8e..c9acd2e0 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js @@ -68,6 +68,8 @@ exports.HtmlDocument = Montage.create(Component, { if (this.model.views.design.initialize(this.model.parentContainer)) { //Hiding iFrame, just initiliazing this.model.views.design.hide(); + //Setting the iFrame property for reference in helper class + this.model.webGlHelper.iframe = this.model.views.design.iframe; } else { //ERROR: Design View not initialized } @@ -82,7 +84,7 @@ exports.HtmlDocument = Montage.create(Component, { this.model.views.design.iframe.style.opacity = 0; this.model.views.design.content = this.model.file.content; //TODO: Improve reference (probably through binding values) - this.model.views.design.model = this.model; + this.model.views.design._webGlHelper = this.model.webGlHelper; //Rendering design view, using observers to know when template is ready this.model.views.design.render(function () { //Adding observer to know when template is ready diff --git a/js/document/models/base.js b/js/document/models/base.js index 0957145a..a3644815 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js @@ -65,7 +65,8 @@ exports.BaseDocumentModel = Montage.create(Component, { _selection: { value: [] }, - + //////////////////////////////////////////////////////////////////// + // selection: { get: function() { return this._selection; @@ -134,20 +135,22 @@ exports.BaseDocumentModel = Montage.create(Component, { } }, //////////////////////////////////////////////////////////////////// - // + //Gets all stylesheets in document getStyleSheets: { value: function () { - // + //Array to store styles (style and link tags) var styles = []; - // + //Looping through document sytles for (var k in this.views.design.iframe.contentWindow.document.styleSheets) { + //Check for styles to has proper propeties if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode && this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute) { + //Check for ninja-template styles, if so, exclude if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute('data-ninja-template') === null) { styles.push(this.views.design.iframe.contentWindow.document.styleSheets[k]); } } } - // + //Returning filtered results return styles; } }, @@ -155,7 +158,7 @@ exports.BaseDocumentModel = Montage.create(Component, { // save: { value: function (callback, libCopyCallback) { - // + //TODO: Implement on demand logic if (this.needsSave) { //Save } else { @@ -184,7 +187,7 @@ exports.BaseDocumentModel = Montage.create(Component, { // saveAll: { value: function (callback, libCopyCallback) { - // + //TODO: Implement on demand logic if (this.needsSave) { //Save } else { @@ -214,47 +217,49 @@ exports.BaseDocumentModel = Montage.create(Component, { // saveAs: { value: function (callback) { - // + //TODO: Implement on demand logic if (this.needsSave) { //Save current file on memory } else { //Copy file from disk } + //TODO: Add functionality } }, //////////////////////////////////////////////////////////////////// // handleSaved: { value: function (result) { - // + //Checking for success code in save if (result.status === 204) { + //Clearing flag with successful save this.model.needsSave = false; } - // + //Making callback call if specifed with results of operation if (this.callback) this.callback(result); } }, //////////////////////////////////////////////////////////////////// - // + //TODO: Implement better logic to include different views on single document close: { value: function (view, callback) { //Outcome of close (pending on save logic) var success; // if (this.needsSave) { - //Prompt user to save of lose data + //TODO: Prompt user to save or lose data } else { //Close file success = true; } - // + //Checking for view mode to close if (this.views.design && (!view || view === 'design')) { - // + //TODO: Create a destroy method, this is messy + this.views.design.pauseAndStopVideos(); this.parentContainer.removeChild(this.views.design.iframe); - this.views.design.pauseAndStopVideos(); this.views.design = null; } - // + //Returning result of operation return success; } } diff --git a/js/document/models/html.js b/js/document/models/html.js index 9aa0d27e..0f88229d 100755 --- a/js/document/models/html.js +++ b/js/document/models/html.js @@ -40,22 +40,32 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { scrollLeft: { value: null }, - + //////////////////////////////////////////////////////////////////// + // scrollTop: { value: null }, - + //////////////////////////////////////////////////////////////////// + // userContentLeft: { value: null }, - + //////////////////////////////////////////////////////////////////// + // userContentTop: { value: null }, //////////////////////////////////////////////////////////////////// - // + //TODO: Convert to bindings + documentRoot: { + get: function() {return this.views.design._documentRoot;}, + set: function(value) {this.views.design._documentRoot = value;} + }, + //////////////////////////////////////////////////////////////////// + //TODO: Convert to bindings baseHref: { - value: null + get: function() {return this.views.design._baseHref;}, + set: function(value) {this.views.design._baseHref = value;} }, //////////////////////////////////////////////////////////////////// // @@ -66,11 +76,6 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { // userComponents: { value: {} - }, - //////////////////////////////////////////////////////////////////// - // - documentRoot: { - value: null }, //////////////////////////////////////////////////////////////////// //Add a reference to a component instance to the userComponents hash using the element UUID diff --git a/js/document/views/design.js b/js/document/views/design.js index f7fbf3c5..53590944 100755 --- a/js/document/views/design.js +++ b/js/document/views/design.js @@ -51,11 +51,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { content: { value: null }, - //////////////////////////////////////////////////////////////////// - //TODO: Remove usage - model: { - value: null - }, //////////////////////////////////////////////////////////////////// // document: { @@ -69,6 +64,33 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { }, //////////////////////////////////////////////////////////////////// // + _baseHref: { + value: null + }, + //////////////////////////////////////////////////////////////////// + // + baseHref: { + get: function() {return this._baseHref;}, + set: function(value) {this._baseHref = value;} + }, + //////////////////////////////////////////////////////////////////// + // + _documentRoot: { + value: null + }, + //////////////////////////////////////////////////////////////////// + // + documentRoot: { + get: function() {return this._documentRoot;}, + set: function(value) {this._documentRoot = value;} + }, + //////////////////////////////////////////////////////////////////// + // + _webGlHelper: { + value: null + }, + //////////////////////////////////////////////////////////////////// + // getLiveNodeList: { value: function(useFilter) { if(useFilter) { @@ -142,7 +164,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { if (basetag.length) { if (basetag[basetag.length-1].getAttribute && basetag[basetag.length-1].getAttribute('href')) { //Setting base HREF in model - this.model.baseHref = basetag[basetag.length-1].getAttribute('href'); + this.baseHref = basetag[basetag.length-1].getAttribute('href'); } } //Checking to content to be template @@ -275,12 +297,12 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { } //TODO: Verify appropiate location for this operation if (this._template && this._template.type === 'banner') { - this.model.documentRoot = this.document.body.getElementsByTagName('ninja-content')[0]; + this.documentRoot = this.document.body.getElementsByTagName('ninja-content')[0]; } else { - this.model.documentRoot = this.document.body; + this.documentRoot = this.document.body; } //Storing node list for reference (might need to store in the model) - this._liveNodeList = this.model.documentRoot.getElementsByTagName('*'); + this._liveNodeList = this.documentRoot.getElementsByTagName('*'); //Getting list of original nodes orgNodes = this.document.getElementsByTagName('*'); //TODO: Figure out if this is ideal for identifying nodes created by Ninja @@ -288,7 +310,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true'); } //Initiliazing document model - document.application.njUtils.makeElementModel(this.model.documentRoot, "Body", "body"); + document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body"); //Makign callback if specified if (this._callback) this._callback(); } @@ -358,8 +380,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { value: function (scripttags) { // var n, webgldata, fileRead; - //Setting the iFrame property for reference in helper class - this.model.webGlHelper.iframe = this.model.views.design.iframe; //Checking for webGL Data for (var w in scripttags) { // @@ -385,7 +405,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { webgldata.data[n] = unescape(webgldata.data[n]); } //TODO: Improve setter of webGL and reference - this.model.webGlHelper.glData = webgldata.data; + this._webGlHelper.glData = webgldata.data; } } } -- cgit v1.2.3 From 98d8cf7fdc1b14a6ac4eaa54f9086a558f3a60cb Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Wed, 6 Jun 2012 13:50:05 -0700 Subject: Cleaning more. --- js/document/views/design.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'js/document') diff --git a/js/document/views/design.js b/js/document/views/design.js index 53590944..5af24546 100755 --- a/js/document/views/design.js +++ b/js/document/views/design.js @@ -26,11 +26,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { _template: { value: null }, - //////////////////////////////////////////////////////////////////// - // - _document: { - value: null - }, //////////////////////////////////////////////////////////////////// // _bodyFragment: { @@ -52,14 +47,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { value: null }, //////////////////////////////////////////////////////////////////// - // - document: { - get: function() {return this._document;}, - set: function(value) {this._document = value;} + // + _liveNodeList: { + value: null }, //////////////////////////////////////////////////////////////////// // - _liveNodeList: { + _webGlHelper: { value: null }, //////////////////////////////////////////////////////////////////// @@ -73,6 +67,17 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { get: function() {return this._baseHref;}, set: function(value) {this._baseHref = value;} }, + //////////////////////////////////////////////////////////////////// + // + _document: { + value: null + }, + //////////////////////////////////////////////////////////////////// + // + document: { + get: function() {return this._document;}, + set: function(value) {this._document = value;} + }, //////////////////////////////////////////////////////////////////// // _documentRoot: { @@ -86,11 +91,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, { }, //////////////////////////////////////////////////////////////////// // - _webGlHelper: { - value: null - }, - //////////////////////////////////////////////////////////////////// - // getLiveNodeList: { value: function(useFilter) { if(useFilter) { -- cgit v1.2.3