From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/ninja.reel/ninja.css | 0 js/ninja.reel/ninja.html | 0 js/ninja.reel/ninja.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/ninja.reel/ninja.css mode change 100644 => 100755 js/ninja.reel/ninja.html mode change 100644 => 100755 js/ninja.reel/ninja.js (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css old mode 100644 new mode 100755 diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html old mode 100644 new mode 100755 diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js old mode 100644 new mode 100755 -- cgit v1.2.3 From 4d5f9c451524829f55ddf26642cb9fc28228b6ce Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Sun, 29 Jan 2012 17:27:29 -0800 Subject: Core API clean up Cleaning up File IO core API and setting up to use URL from welcome screen or local storage. Class will perform an automatic check for IO API to be active, otherwise prompt user. --- js/ninja.reel/ninja.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 706c8243..26ad2256 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -258,6 +258,11 @@ "module": "js/io/workflow/newFileDialog/new-file-workflow-controller", "name": "NewFileWorkflowController" }, + + "coreIoApi1": { + "module": "js/io/system/coreioapi", + "name": "CoreIoApi" + }, "owner": { "module": "js/ninja.reel", @@ -279,6 +284,7 @@ "stylesController": {"@": "stylesController"}, "filePickerController": {"@": "filePickerController"}, "newFileController": {"@": "newFileController"}, + "coreIoApi": {"@": "coreIoApi1"}, "documentBar": {"@": "documentBar"} } } -- cgit v1.2.3 From e75223a2c4c1e13d66639841e6418e94fe9b726f Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 31 Jan 2012 15:59:46 -0800 Subject: Cloud IO Prompt Setting up UI for the file IO prompt on initialization of Ninja and whenever a cloud IO call is made and the server is not detected. --- js/ninja.reel/ninja.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 465533cd..38bc22fb 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -97,6 +97,10 @@ exports.Ninja = Montage.create(Component, { didDraw: { value: function() { NJevent("appLoaded"); + // + if (!this.application.ninja.coreIoApi.ioServiceDetected) { + var check = this.application.ninja.coreIoApi.cloudAvailable(); + } } }, -- cgit v1.2.3 From 0e595c4e11ce9b44eff157de8616ed15fcd5d6fc Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 2 Feb 2012 12:37:29 -0800 Subject: refactoring some file names and locations, change made to maintain only one codemirror div. Signed-off-by: Ananya Sen --- 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 26ad2256..0f23a18f 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -255,7 +255,7 @@ }, "newFileController": { - "module": "js/io/workflow/newFileDialog/new-file-workflow-controller", + "module": "js/io/ui/new-file-dialog/new-file-workflow-controller", "name": "NewFileWorkflowController" }, -- cgit v1.2.3 From 9b5ad78b393e87d84e79abe0abd0c96a685e5962 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 2 Feb 2012 18:20:45 -0800 Subject: Removing reference to Ninja Utils This was removed, will need to check was it affects. Also added the removed checking script on Ninja didDraw to prompt user for cloud simulator. --- js/ninja.reel/ninja.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 90015f5a..3b9fc1c5 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -101,6 +101,9 @@ exports.Ninja = Montage.create(Component, { didDraw: { value: function() { if(!this._didDraw) { + if (!this.application.ninja.coreIoApi.ioServiceDetected) { + var check = this.application.ninja.coreIoApi.cloudAvailable(); + } NJevent("appLoaded"); this._didDraw = true; } -- cgit v1.2.3 From 1daf146c849a0a8dbd2b61b14218c9a39bdee3a7 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Fri, 3 Feb 2012 17:22:48 -0800 Subject: added editor tab save while switching code view tabs, integrated new file dialog with io mediator to open the new file in a new tab Signed-off-by: Ananya Sen --- js/ninja.reel/ninja.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 0f23a18f..37c269e0 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -216,6 +216,11 @@ "name": "ElementMediator" }, + "ioMediator": { + "module": "js/mediators/io-mediator", + "name": "IoMediator" + }, + "undocontroller1": { "module": "js/controllers/undo-controller", "name": "UndoController" @@ -285,7 +290,8 @@ "filePickerController": {"@": "filePickerController"}, "newFileController": {"@": "newFileController"}, "coreIoApi": {"@": "coreIoApi1"}, - "documentBar": {"@": "documentBar"} + "documentBar": {"@": "documentBar"}, + "ioMediator": {"@": "ioMediator"} } } -- cgit v1.2.3 From 272c5f74f4ce76fec9cbe360817bf23639307d3a Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Sun, 5 Feb 2012 19:20:37 -0800 Subject: changes to show document dirty indicator on editing code view, and to remove dirty indicator on save. Signed-off-by: Ananya Sen --- js/ninja.reel/ninja.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 37c269e0..6630f4a8 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -274,6 +274,8 @@ "name": "Ninja", "properties": { "element": {"#": "main"}, + "rulerTop": {"#": "rulerTop"}, + "rulerLeft": {"#": "rulerLeft"}, "appModel": {"@": "appModel"}, "toolsData": {"@": "toolsData1"}, "toolsList": {"@": "toolsList1"}, -- cgit v1.2.3 From 632a5daca17acb774b9344ccc0e9107f1643924c Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 10 Feb 2012 15:29:12 -0800 Subject: File Open Adding the functionality to open a basic file. --- 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 6630f4a8..c170b16f 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -232,7 +232,7 @@ }, "documentController1": { - "module": "js/io/document/document-controller", + "module": "js/controllers/document-controller", "name": "DocumentController" }, -- cgit v1.2.3 From 0eb739ab722ea768ab0fa1c5de0ee09ed1a576ea Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 14 Feb 2012 00:25:45 -0800 Subject: Add support for drag and drop for the components. Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 1 + 1 file changed, 1 insertion(+) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index c8625159..6daa75de 100644 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -276,6 +276,7 @@ "stage": {"@": "stage1"}, "settings": {"@": "settings1"}, "elementMediator": {"@": "elementMediator"}, + "dragDropMediator": {"@": "dragDropMediator"}, "undocontroller": {"@": "undocontroller1"}, "selectionController": {"@": "selectionController1"}, "documentController": {"@": "documentController1"}, -- cgit v1.2.3 From 08101852de934ed674807b26ab89f432daa4d6fe Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 14 Feb 2012 12:01:57 -0800 Subject: Fixing the live preview background issue. Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 469d38f7..e9c79230 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -186,7 +186,7 @@ exports.Ninja = Montage.create(Component, { transitionStopRule = "*" } - this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "background", background); + this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); -- cgit v1.2.3