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/ninja.reel/ninja.html | 4 +-- js/ninja.reel/ninja.js | 94 ++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 49 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 706b77d4..77d6d647 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -406,7 +406,7 @@ POSSIBILITY OF SUCH DAMAGE. "selectionController": {"@": "selectionController"}, "documentController": {"@": "documentController"}, "popupManager": {"@": "popupManager1"}, - "colorController": {"@": "colorController1"}, + "colorController": {"@": "colorController1"}, "stylesController": {"@": "stylesController"}, "presetsController": {"@": "presetsController"}, "filePickerController": {"@": "filePickerController"}, @@ -424,7 +424,7 @@ POSSIBILITY OF SUCH DAMAGE. "timelineSplitter": {"@": "splitter4"}, "toolsSplitter": {"@": "splitter2"}, "optionsSplitter": {"@": "splitter1"}, - "clipboardController": {"@": "clipboardController"}, + "clipboardController": {"@": "clipboardController"}, "documentList": {"@": "documentList"} } } diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 3fe39aa7..aa37c65f 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -28,11 +28,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - UndoManager = require("montage/core/undo-manager").UndoManager, - AppData = require("js/data/appdata").AppData, - Popup = require("js/components/popup.reel").Popup; +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component, + UndoManager = require("montage/core/undo-manager").UndoManager, + AppData = require("js/data/appdata").AppData, + Popup = require("js/components/popup.reel").Popup; var matrix = require("js/lib/math/matrix"); var NjUtils = require("js/lib/NJUtils").NJUtils; @@ -215,7 +215,7 @@ exports.Ninja = Montage.create(Component, { } }, - _workspaceMode: { + _workspaceMode: { value: null }, @@ -370,7 +370,7 @@ exports.Ninja = Montage.create(Component, { window.addEventListener("resize", this, false); //Prompting the user to make sure data was saved before closing Ninja window.onbeforeunload = function () { - return 'Are you sure you want to close Ninja? Any unsaved data will be lost.'; + return 'Are you sure you want to close Ninja? Any unsaved data will be lost.'; }; this.eventManager.addEventListener("selectTool", this, false); @@ -385,44 +385,44 @@ exports.Ninja = Montage.create(Component, { //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// - //TODO: Expand method to allow other browsers for preview + //TODO: Expand method to allow other browsers for preview executeChromePreview: { - value: function () { - //TODO: Make into proper component - this.saveOperationScreen = {}; - this._saveOperationPopup = {}; - //Show - this.saveOperationScreen.show = function (ctxt) { - // - ctxt._saveOperationPopup.blackout = document.createElement('div'); - ctxt._saveOperationPopup.blackout.style.width = '100%'; - ctxt._saveOperationPopup.blackout.style.height = '100%'; - ctxt._saveOperationPopup.blackout.style.background = 'rgba(0,0,0,0.8)'; //'-webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%)'; - ctxt.application.ninja.popupManager.addPopup(ctxt._saveOperationPopup.blackout); - }; - //Hide - this.saveOperationScreen.hide = function (ctxt) { - ctxt.application.ninja.popupManager.removePopup(ctxt._saveOperationPopup.blackout); - }; - // - this.currentDocument.model.browserPreview('chrome', this.saveOperationScreen, this); - } - }, - //////////////////////////////////////////////////////////////////// - - //TODO: Make into proper component - _saveOperationPopup: { - value: null - }, - //TODO: Make into proper component - saveOperationScreen: { - value: null - }, - - //////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////// - - + value: function () { + //TODO: Make into proper component + this.saveOperationScreen = {}; + this._saveOperationPopup = {}; + //Show + this.saveOperationScreen.show = function (ctxt) { + // + ctxt._saveOperationPopup.blackout = document.createElement('div'); + ctxt._saveOperationPopup.blackout.style.width = '100%'; + ctxt._saveOperationPopup.blackout.style.height = '100%'; + ctxt._saveOperationPopup.blackout.style.background = 'rgba(0,0,0,0.8)'; //'-webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%)'; + ctxt.application.ninja.popupManager.addPopup(ctxt._saveOperationPopup.blackout); + }; + //Hide + this.saveOperationScreen.hide = function (ctxt) { + ctxt.application.ninja.popupManager.removePopup(ctxt._saveOperationPopup.blackout); + }; + // + this.currentDocument.model.browserPreview('chrome', this.saveOperationScreen, this); + } + }, + //////////////////////////////////////////////////////////////////// + + //TODO: Make into proper component + _saveOperationPopup: { + value: null + }, + //TODO: Make into proper component + saveOperationScreen: { + value: null + }, + + //////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////// + + handleResize: { value: function() { this.stage.resizeCanvases = true; @@ -449,9 +449,9 @@ exports.Ninja = Montage.create(Component, { value: function() { if(!this._didDraw) { - if (!this.application.ninja.coreIoApi.ioServiceDetected) { - var check = this.application.ninja.coreIoApi.cloudAvailable(); - } + if (!this.application.ninja.coreIoApi.ioServiceDetected) { + var check = this.application.ninja.coreIoApi.cloudAvailable(); + } NJevent("appLoaded"); this._didDraw = true; } -- 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/ninja.reel/ninja.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index aa37c65f..6de15490 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -381,8 +381,8 @@ exports.Ninja = Montage.create(Component, { this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); } }, - - + + //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// //TODO: Expand method to allow other browsers for preview @@ -409,7 +409,7 @@ exports.Ninja = Montage.create(Component, { } }, //////////////////////////////////////////////////////////////////// - + //TODO: Make into proper component _saveOperationPopup: { value: null @@ -418,11 +418,11 @@ exports.Ninja = Montage.create(Component, { saveOperationScreen: { value: null }, - + //////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////// - - + + handleResize: { value: function() { this.stage.resizeCanvases = true; @@ -444,7 +444,7 @@ exports.Ninja = Montage.create(Component, { _didDraw: { value: false }, - + didDraw: { value: function() { -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- js/ninja.reel/ninja.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 77d6d647..05d1ca54 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -338,7 +338,7 @@ POSSIBILITY OF SUCH DAMAGE. "element": {"#": "popupWindows"} } }, - + "colorController1": { "prototype": "js/controllers/color-controller" }, @@ -354,7 +354,7 @@ POSSIBILITY OF SUCH DAMAGE. "newFileController": { "prototype": "js/io/ui/new-file-dialog/new-file-workflow-controller" }, - + "coreIoApi1": { "prototype": "js/io/system/coreioapi[CoreIoApi]" }, -- cgit v1.2.3 From 40c6eb2c06b34f65a74d59ef9687251952858bab Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:47:27 -0700 Subject: Normalize HTML doctype --- js/ninja.reel/ninja.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 05d1ca54..05b37bba 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -1,4 +1,4 @@ - +