diff options
author | Kris Kowal | 2012-07-06 11:52:06 -0700 |
---|---|---|
committer | Kris Kowal | 2012-07-06 15:01:48 -0700 |
commit | 648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch) | |
tree | 8f0f55557bd0c47a84e49c1977c950645d284607 /js/ninja.reel | |
parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
download | ninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz |
Expand tabs
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 4 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 94 |
2 files changed, 49 insertions, 49 deletions
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. | |||
406 | "selectionController": {"@": "selectionController"}, | 406 | "selectionController": {"@": "selectionController"}, |
407 | "documentController": {"@": "documentController"}, | 407 | "documentController": {"@": "documentController"}, |
408 | "popupManager": {"@": "popupManager1"}, | 408 | "popupManager": {"@": "popupManager1"}, |
409 | "colorController": {"@": "colorController1"}, | 409 | "colorController": {"@": "colorController1"}, |
410 | "stylesController": {"@": "stylesController"}, | 410 | "stylesController": {"@": "stylesController"}, |
411 | "presetsController": {"@": "presetsController"}, | 411 | "presetsController": {"@": "presetsController"}, |
412 | "filePickerController": {"@": "filePickerController"}, | 412 | "filePickerController": {"@": "filePickerController"}, |
@@ -424,7 +424,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
424 | "timelineSplitter": {"@": "splitter4"}, | 424 | "timelineSplitter": {"@": "splitter4"}, |
425 | "toolsSplitter": {"@": "splitter2"}, | 425 | "toolsSplitter": {"@": "splitter2"}, |
426 | "optionsSplitter": {"@": "splitter1"}, | 426 | "optionsSplitter": {"@": "splitter1"}, |
427 | "clipboardController": {"@": "clipboardController"}, | 427 | "clipboardController": {"@": "clipboardController"}, |
428 | "documentList": {"@": "documentList"} | 428 | "documentList": {"@": "documentList"} |
429 | } | 429 | } |
430 | } | 430 | } |
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 | |||
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | 30 | ||
31 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
32 | Component = require("montage/ui/component").Component, | 32 | Component = require("montage/ui/component").Component, |
33 | UndoManager = require("montage/core/undo-manager").UndoManager, | 33 | UndoManager = require("montage/core/undo-manager").UndoManager, |
34 | AppData = require("js/data/appdata").AppData, | 34 | AppData = require("js/data/appdata").AppData, |
35 | Popup = require("js/components/popup.reel").Popup; | 35 | Popup = require("js/components/popup.reel").Popup; |
36 | 36 | ||
37 | var matrix = require("js/lib/math/matrix"); | 37 | var matrix = require("js/lib/math/matrix"); |
38 | var NjUtils = require("js/lib/NJUtils").NJUtils; | 38 | var NjUtils = require("js/lib/NJUtils").NJUtils; |
@@ -215,7 +215,7 @@ exports.Ninja = Montage.create(Component, { | |||
215 | } | 215 | } |
216 | }, | 216 | }, |
217 | 217 | ||
218 | _workspaceMode: { | 218 | _workspaceMode: { |
219 | value: null | 219 | value: null |
220 | }, | 220 | }, |
221 | 221 | ||
@@ -370,7 +370,7 @@ exports.Ninja = Montage.create(Component, { | |||
370 | window.addEventListener("resize", this, false); | 370 | window.addEventListener("resize", this, false); |
371 | //Prompting the user to make sure data was saved before closing Ninja | 371 | //Prompting the user to make sure data was saved before closing Ninja |
372 | window.onbeforeunload = function () { | 372 | window.onbeforeunload = function () { |
373 | return 'Are you sure you want to close Ninja? Any unsaved data will be lost.'; | 373 | return 'Are you sure you want to close Ninja? Any unsaved data will be lost.'; |
374 | }; | 374 | }; |
375 | 375 | ||
376 | this.eventManager.addEventListener("selectTool", this, false); | 376 | this.eventManager.addEventListener("selectTool", this, false); |
@@ -385,44 +385,44 @@ exports.Ninja = Montage.create(Component, { | |||
385 | 385 | ||
386 | //////////////////////////////////////////////////////////////////// | 386 | //////////////////////////////////////////////////////////////////// |
387 | //////////////////////////////////////////////////////////////////// | 387 | //////////////////////////////////////////////////////////////////// |
388 | //TODO: Expand method to allow other browsers for preview | 388 | //TODO: Expand method to allow other browsers for preview |
389 | executeChromePreview: { | 389 | executeChromePreview: { |
390 | value: function () { | 390 | value: function () { |
391 | //TODO: Make into proper component | 391 | //TODO: Make into proper component |
392 | this.saveOperationScreen = {}; | 392 | this.saveOperationScreen = {}; |
393 | this._saveOperationPopup = {}; | 393 | this._saveOperationPopup = {}; |
394 | //Show | 394 | //Show |
395 | this.saveOperationScreen.show = function (ctxt) { | 395 | this.saveOperationScreen.show = function (ctxt) { |
396 | // | 396 | // |
397 | ctxt._saveOperationPopup.blackout = document.createElement('div'); | 397 | ctxt._saveOperationPopup.blackout = document.createElement('div'); |
398 | ctxt._saveOperationPopup.blackout.style.width = '100%'; | 398 | ctxt._saveOperationPopup.blackout.style.width = '100%'; |
399 | ctxt._saveOperationPopup.blackout.style.height = '100%'; | 399 | ctxt._saveOperationPopup.blackout.style.height = '100%'; |
400 | 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%)'; | 400 | 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%)'; |
401 | ctxt.application.ninja.popupManager.addPopup(ctxt._saveOperationPopup.blackout); | 401 | ctxt.application.ninja.popupManager.addPopup(ctxt._saveOperationPopup.blackout); |
402 | }; | 402 | }; |
403 | //Hide | 403 | //Hide |
404 | this.saveOperationScreen.hide = function (ctxt) { | 404 | this.saveOperationScreen.hide = function (ctxt) { |
405 | ctxt.application.ninja.popupManager.removePopup(ctxt._saveOperationPopup.blackout); | 405 | ctxt.application.ninja.popupManager.removePopup(ctxt._saveOperationPopup.blackout); |
406 | }; | 406 | }; |
407 | // | 407 | // |
408 | this.currentDocument.model.browserPreview('chrome', this.saveOperationScreen, this); | 408 | this.currentDocument.model.browserPreview('chrome', this.saveOperationScreen, this); |
409 | } | 409 | } |
410 | }, | 410 | }, |
411 | //////////////////////////////////////////////////////////////////// | 411 | //////////////////////////////////////////////////////////////////// |
412 | 412 | ||
413 | //TODO: Make into proper component | 413 | //TODO: Make into proper component |
414 | _saveOperationPopup: { | 414 | _saveOperationPopup: { |
415 | value: null | 415 | value: null |
416 | }, | 416 | }, |
417 | //TODO: Make into proper component | 417 | //TODO: Make into proper component |
418 | saveOperationScreen: { | 418 | saveOperationScreen: { |
419 | value: null | 419 | value: null |
420 | }, | 420 | }, |
421 | 421 | ||
422 | //////////////////////////////////////////////////////////////////// | 422 | //////////////////////////////////////////////////////////////////// |
423 | //////////////////////////////////////////////////////////////////// | 423 | //////////////////////////////////////////////////////////////////// |
424 | 424 | ||
425 | 425 | ||
426 | handleResize: { | 426 | handleResize: { |
427 | value: function() { | 427 | value: function() { |
428 | this.stage.resizeCanvases = true; | 428 | this.stage.resizeCanvases = true; |
@@ -449,9 +449,9 @@ exports.Ninja = Montage.create(Component, { | |||
449 | value: function() { | 449 | value: function() { |
450 | 450 | ||
451 | if(!this._didDraw) { | 451 | if(!this._didDraw) { |
452 | if (!this.application.ninja.coreIoApi.ioServiceDetected) { | 452 | if (!this.application.ninja.coreIoApi.ioServiceDetected) { |
453 | var check = this.application.ninja.coreIoApi.cloudAvailable(); | 453 | var check = this.application.ninja.coreIoApi.cloudAvailable(); |
454 | } | 454 | } |
455 | NJevent("appLoaded"); | 455 | NJevent("appLoaded"); |
456 | this._didDraw = true; | 456 | this._didDraw = true; |
457 | } | 457 | } |