From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/document/document-html.js | 136 +++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'js/document/document-html.js') diff --git a/js/document/document-html.js b/js/document/document-html.js index 566e5078..a7a0f03a 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js @@ -30,40 +30,40 @@ POSSIBILITY OF SUCH DAMAGE. //////////////////////////////////////////////////////////////////////// // -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel, - DesignDocumentView = require("js/document/views/design").DesignDocumentView; +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component, + HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel, + DesignDocumentView = require("js/document/views/design").DesignDocumentView; //////////////////////////////////////////////////////////////////////// -// +// exports.HtmlDocument = Montage.create(Component, { - //////////////////////////////////////////////////////////////////// - // - hasTemplate: { + //////////////////////////////////////////////////////////////////// + // + hasTemplate: { value: false }, //////////////////////////////////////////////////////////////////// - // + // model: { value: null }, - //////////////////////////////////////////////////////////////////// - // + //////////////////////////////////////////////////////////////////// + // loaded: { value: {callback: null, context: null} }, //////////////////////////////////////////////////////////////////// - // + // _observer: { value: null }, - //////////////////////////////////////////////////////////////////// - // + //////////////////////////////////////////////////////////////////// + // exclusionList: { value: ["HTML", "BODY", "NINJA-CONTENT", "NINJA-VIEWPORT"] }, //////////////////////////////////////////////////////////////////// - // + // inExclusion: { value: function(element) { if(this.exclusionList.indexOf(element.nodeName) === -1) { @@ -72,62 +72,62 @@ exports.HtmlDocument = Montage.create(Component, { return 1; } }, - //////////////////////////////////////////////////////////////////// - // + //////////////////////////////////////////////////////////////////// + // init: { value:function(file, context, callback, view, template) { - //Storing callback data for loaded dispatch - this.loaded.callback = callback; - this.loaded.context = context; + //Storing callback data for loaded dispatch + this.loaded.callback = callback; + this.loaded.context = context; //Creating instance of HTML Document Model this.model = Montage.create(HtmlDocumentModel,{ - file: {value: file}, - fileTemplate: {value: template}, - parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach - views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic + file: {value: file}, + fileTemplate: {value: template}, + parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach + views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic }); //Calling the any init routines in the model this.model.init(); //Initiliazing views and hiding - 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 - } + 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 + } // if (view === 'design') { - //TODO: Remove reference and use as part of model - this.currentView = 'design'; - //Setting current view object to design - this.model.currentView = this.model.views.design; - //Showing design iFrame - this.model.views.design.show(); - 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._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 - this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this)); - this._observer.observe(this.model.views.design.document.head, {childList: true}); - }.bind(this), template, {viewCallback: this.handleViewReady, context: this}); + //TODO: Remove reference and use as part of model + this.currentView = 'design'; + //Setting current view object to design + this.model.currentView = this.model.views.design; + //Showing design iFrame + this.model.views.design.show(); + 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._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 + this._observer = new WebKitMutationObserver(this.handleTemplateReady.bind(this)); + this._observer.observe(this.model.views.design.document.head, {childList: true}); + }.bind(this), template, {viewCallback: this.handleViewReady, context: this}); } else { - //TODO: Identify default view (probably code) + //TODO: Identify default view (probably code) } } }, //////////////////////////////////////////////////////////////////// - // + // handleTemplateReady: { - value: function (e) { - //Removing observer, only needed on initial load - this._observer.disconnect(); - this._observer = null; - } + value: function (e) { + //Removing observer, only needed on initial load + this._observer.disconnect(); + this._observer = null; + } }, handleViewReady: { value: function(mObjects) { @@ -143,17 +143,17 @@ exports.HtmlDocument = Montage.create(Component, { } }, //////////////////////////////////////////////////////////////////// - // - closeDocument: { - value: function (context, callback) { - //Closing document (sending null to close all views) - this.model.close(null, function () {if (callback) callback.call(context, this);}.bind(this)); - } - }, + // + closeDocument: { + value: function (context, callback) { + //Closing document (sending null to close all views) + this.model.close(null, function () {if (callback) callback.call(context, this);}.bind(this)); + } + }, //////////////////////////////////////////////////////////////////// - // + // serializeDocument: { - value: function () { + value: function () { // Serialize the current scroll position //TODO: Move these properties to the design view class this.model.scrollLeft = this.application.ninja.stage._scrollLeft; @@ -169,12 +169,12 @@ exports.HtmlDocument = Montage.create(Component, { // Pause the videos //TODO: Move these to be handled on the show/hide methods in the view this.model.views.design.pauseVideos(); - } + } }, //////////////////////////////////////////////////////////////////// - // + // deserializeDocument: { - value: function () { + value: function () { // Deserialize the current scroll position //TODO: Move these properties to the design view class this.application.ninja.stage._scrollLeft = this.model.scrollLeft; @@ -184,7 +184,7 @@ exports.HtmlDocument = Montage.create(Component, { // Serialize the undo // TODO: Save the montage undo queue - } + } } //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/document/document-html.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/document/document-html.js') diff --git a/js/document/document-html.js b/js/document/document-html.js index a7a0f03a..1ebdd28a 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js @@ -35,7 +35,7 @@ var Montage = require("montage/core/core").Montage, HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel, DesignDocumentView = require("js/document/views/design").DesignDocumentView; //////////////////////////////////////////////////////////////////////// -// +// exports.HtmlDocument = Montage.create(Component, { //////////////////////////////////////////////////////////////////// // -- cgit v1.2.3 From fdbec324dad4ab33d97282ab021d2c1661bc097c Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Mon, 9 Jul 2012 16:27:52 -0700 Subject: BSD License --- js/document/document-html.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'js/document/document-html.js') diff --git a/js/document/document-html.js b/js/document/document-html.js index 1ebdd28a..142ffe4a 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js @@ -1,24 +1,25 @@ /* -Copyright (c) 2012, Motorola Mobility, Inc +Copyright (c) 2012, Motorola Mobility LLC. All Rights Reserved. -BSD License. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - Neither the name of Motorola Mobility nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of Motorola Mobility LLC nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- cgit v1.2.3