Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts: js/helper-classes/3D/StageLine.js
author: hwc487 2012-07-09 16:08:02 -0700
committer: hwc487 2012-07-09 16:08:02 -0700
commit: 5085d0f67df89a21715308956004164597a6ba79 (patch)
tree: 2c896163143a66331205a39b0a3b1b45d51bf12a /js/io/system/coreioapi.js
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
1 files changed, 285 insertions, 285 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index d3977106..c3782aef 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -32,87 +32,87 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 NOTES:
-        Core API reference in NINJA: this.application.ninja.coreIoApi
+    Core API reference in NINJA: this.application.ninja.coreIoApi
-        
 ////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////// */
-var Montage =           require("montage/core/core").Montage,
+var Montage =       require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component,
+    Component =     require("montage/ui/component").Component,
-    Popup =             require("js/components/popup.reel").Popup,
+    Popup =         require("js/components/popup.reel").Popup,
-    CloudPopup =        require("js/io/ui/cloudpopup.reel").CloudPopup,
+    CloudPopup =    require("js/io/ui/cloudpopup.reel").CloudPopup,
-    ChromeApi =         require("js/io/system/chromeapi").ChromeApi,
+    ChromeApi =     require("js/io/system/chromeapi").ChromeApi,
-    NinjaLibrary =      require("js/io/system/ninjalibrary").NinjaLibrary;
+    NinjaLibrary =  require("js/io/system/ninjalibrary").NinjaLibrary;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as Project I/O
 exports.CoreIoApi = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //
-        deserializedFromTemplate: {
+    deserializedFromTemplate: {
-                enumerable: false,
+        enumerable: false,
-                value: function () {
+        value: function () {
-                        ////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////
-                        //Checking for local storage of URL for IO
+            //Checking for local storage of URL for IO
            if (this.application.localStorage.getItem("ioRootUrl")) {
-                                //Getting URL from local storage
+                //Getting URL from local storage
                this.rootUrl = this.application.localStorage.getItem("ioRootUrl");
-                                //Checks for IO API to be active
+                //Checks for IO API to be active
-                                this.ioServiceDetected = this.cloudAvailable();
+                this.ioServiceDetected = this.cloudAvailable();
-                        } else {
+            } else {
-                                //IO API to be inactive
+                //IO API to be inactive
-                                this.ioServiceDetected = false;
+                this.ioServiceDetected = false;
-                        }
+            }
-                        ////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////
-                        //Instance of ninja library
+            //Instance of ninja library
-                        this.ninjaLibrary = NinjaLibrary;
+            this.ninjaLibrary = NinjaLibrary;
-                        this.ninjaLibrary.coreApi = this;
+            this.ninjaLibrary.coreApi = this;
-                        //Getting reference of chrome file system API
+            //Getting reference of chrome file system API
-                        this.chromeFileSystem = ChromeApi;
+            this.chromeFileSystem = ChromeApi;
-                        //Sending size in MBs for file system storage
+            //Sending size in MBs for file system storage
-                        var chromeFs = this.chromeFileSystem.init(20);
+            var chromeFs = this.chromeFileSystem.init(20);
-                        //Checking for availability of API
+            //Checking for availability of API
-                        if (chromeFs) {
+            if (chromeFs) {
-                                this.chromeFileSystem.addEventListener('ready', this, false);
+                this.chromeFileSystem.addEventListener('ready', this, false);
-                        } else {
+            } else {
-                                //Error, Chrome File System API not detected
+                //Error, Chrome File System API not detected
-                        }
+            }
-                        ////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////
-                }
+        }
-        },
+    },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
    //
-        handleReady: {
+    handleReady: {
-                enumerable: false,
+        enumerable: false,
        value: function (e) {
-                //Removing events
+            //Removing events
-                this.chromeFileSystem.removeEventListener('ready', this, false);
+            this.chromeFileSystem.removeEventListener('ready', this, false);
-                //Listening for library to be copied event (builds list)
+            //Listening for library to be copied event (builds list)
-                this.chromeFileSystem.addEventListener('library', this, false);
+            this.chromeFileSystem.addEventListener('library', this, false);
-                //TODO: Add sync loading screen logic (Add screen here)
+            //TODO: Add sync loading screen logic (Add screen here)
        }
-        },
+    },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
    //
-        handleLibrary: {
+    handleLibrary: {
-                enumerable: false,
+        enumerable: false,
        value: function (e) {
-                //Removing events
+            //Removing events
-                this.chromeFileSystem.removeEventListener('library', this, false);
+            this.chromeFileSystem.removeEventListener('library', this, false);
-                //Listening for synced library event
+            //Listening for synced library event
-                this.ninjaLibrary.addEventListener('sync', this, false);
+            this.ninjaLibrary.addEventListener('sync', this, false);
-                //Sending library to be synced to chrome
+            //Sending library to be synced to chrome
-                this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);
+            this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);
-                
        }
-        },
+    },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
    //
-        handleSync: {
+    handleSync: {
-                enumerable: false,
+        enumerable: false,
        value: function (e) {
-                console.log('Ninja Local Library: Ready');
+            console.log('Ninja Local Library: Ready');
-                //Removing events
+            //Removing events
-                this.ninjaLibrary.removeEventListener('sync', this, false);
+            this.ninjaLibrary.removeEventListener('sync', this, false);
-                //TODO: Add sync loading screen logic (Remove screen here)
+            //TODO: Add sync loading screen logic (Remove screen here)
        }
    },
    ////////////////////////////////////////////////////////////////////
@@ -124,12 +124,12 @@ exports.CoreIoApi = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //
    chromeNinjaLibrary: {
-        enumerable: false,
+        enumerable: false,
-        get: function() {
+        get: function() {
            return this._chromeNinjaLibrary;
        },
        set: function(value) {
-                this._chromeNinjaLibrary = value;
+            this._chromeNinjaLibrary = value;
        }
    },
    ////////////////////////////////////////////////////////////////////
@@ -141,15 +141,15 @@ exports.CoreIoApi = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //
    chromeFileSystem: {
-        enumerable: false,
+        enumerable: false,
-        get: function() {
+        get: function() {
            return this._chromeFileSystem;
        },
        set: function(value) {
-                this._chromeFileSystem = value;
+            this._chromeFileSystem = value;
        }
    },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
    //
    _ioServiceDetected: {
        enumerable: false,
@@ -158,15 +158,15 @@ exports.CoreIoApi = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //Checking for service availability on boot
    ioServiceDetected: {
-        enumerable: false,
+        enumerable: false,
-        get: function() {
+        get: function() {
            return this._ioServiceDetected;
        },
        set: function(value) {
-                this._ioServiceDetected = value;
+            this._ioServiceDetected = value;
        }
    },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
    //Root API URL
    _rootUrl: {
        enumerable: false,
@@ -175,15 +175,15 @@ exports.CoreIoApi = Montage.create(Component, {
    ////////////////////////////////////////////////////////////////////
    //
    rootUrl: {
-        enumerable: false,
+        enumerable: false,
-        get: function() {
+        get: function() {
            return this._rootUrl;
        },
        set: function(value) {
-                this._rootUrl = this.application.localStorage.setItem("ioRootUrl", value);
+            this._rootUrl = this.application.localStorage.setItem("ioRootUrl", value);
        }
    },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/io/system/coreioapi.js
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index d3977106..c3782aef 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js
@@ -32,87 +32,87 @@ POSSIBILITY OF SUCH DAMAGE.
32	////////////////////////////////////////////////////////////////////////	32	////////////////////////////////////////////////////////////////////////
33	NOTES:	33	NOTES:
34		34
35	Core API reference in NINJA: this.application.ninja.coreIoApi	35	Core API reference in NINJA: this.application.ninja.coreIoApi
36		36
37	////////////////////////////////////////////////////////////////////////	37	////////////////////////////////////////////////////////////////////////
38	///////////////////////////////////////////////////////////////////// */	38	///////////////////////////////////////////////////////////////////// */
39	var Montage = require("montage/core/core").Montage,	39	var Montage = require("montage/core/core").Montage,
40	Component = require("montage/ui/component").Component,	40	Component = require("montage/ui/component").Component,
41	Popup = require("js/components/popup.reel").Popup,	41	Popup = require("js/components/popup.reel").Popup,
42	CloudPopup = require("js/io/ui/cloudpopup.reel").CloudPopup,	42	CloudPopup = require("js/io/ui/cloudpopup.reel").CloudPopup,
43	ChromeApi = require("js/io/system/chromeapi").ChromeApi,	43	ChromeApi = require("js/io/system/chromeapi").ChromeApi,
44	NinjaLibrary = require("js/io/system/ninjalibrary").NinjaLibrary;	44	NinjaLibrary = require("js/io/system/ninjalibrary").NinjaLibrary;
45	////////////////////////////////////////////////////////////////////////	45	////////////////////////////////////////////////////////////////////////
46	//Exporting as Project I/O	46	//Exporting as Project I/O
47	exports.CoreIoApi = Montage.create(Component, {	47	exports.CoreIoApi = Montage.create(Component, {
48	////////////////////////////////////////////////////////////////////	48	////////////////////////////////////////////////////////////////////
49	//	49	//
50	deserializedFromTemplate: {	50	deserializedFromTemplate: {
51	enumerable: false,	51	enumerable: false,
52	value: function () {	52	value: function () {
53	////////////////////////////////////////////////////////////	53	////////////////////////////////////////////////////////////
54	//Checking for local storage of URL for IO	54	//Checking for local storage of URL for IO
55	if (this.application.localStorage.getItem("ioRootUrl")) {	55	if (this.application.localStorage.getItem("ioRootUrl")) {
56	//Getting URL from local storage	56	//Getting URL from local storage
57	this.rootUrl = this.application.localStorage.getItem("ioRootUrl");	57	this.rootUrl = this.application.localStorage.getItem("ioRootUrl");
58	//Checks for IO API to be active	58	//Checks for IO API to be active
59	this.ioServiceDetected = this.cloudAvailable();	59	this.ioServiceDetected = this.cloudAvailable();
60	} else {	60	} else {
61	//IO API to be inactive	61	//IO API to be inactive
62	this.ioServiceDetected = false;	62	this.ioServiceDetected = false;
63	}	63	}
64	////////////////////////////////////////////////////////////	64	////////////////////////////////////////////////////////////
65	//Instance of ninja library	65	//Instance of ninja library
66	this.ninjaLibrary = NinjaLibrary;	66	this.ninjaLibrary = NinjaLibrary;
67	this.ninjaLibrary.coreApi = this;	67	this.ninjaLibrary.coreApi = this;
68	//Getting reference of chrome file system API	68	//Getting reference of chrome file system API
69	this.chromeFileSystem = ChromeApi;	69	this.chromeFileSystem = ChromeApi;
70	//Sending size in MBs for file system storage	70	//Sending size in MBs for file system storage
71	var chromeFs = this.chromeFileSystem.init(20);	71	var chromeFs = this.chromeFileSystem.init(20);
72	//Checking for availability of API	72	//Checking for availability of API
73	if (chromeFs) {	73	if (chromeFs) {
74	this.chromeFileSystem.addEventListener('ready', this, false);	74	this.chromeFileSystem.addEventListener('ready', this, false);
75	} else {	75	} else {
76	//Error, Chrome File System API not detected	76	//Error, Chrome File System API not detected
77	}	77	}
78	////////////////////////////////////////////////////////////	78	////////////////////////////////////////////////////////////
79	}	79	}
80	},	80	},
81	////////////////////////////////////////////////////////////////////	81	////////////////////////////////////////////////////////////////////
82	//	82	//
83	handleReady: {	83	handleReady: {
84	enumerable: false,	84	enumerable: false,
85	value: function (e) {	85	value: function (e) {
86	//Removing events	86	//Removing events
87	this.chromeFileSystem.removeEventListener('ready', this, false);	87	this.chromeFileSystem.removeEventListener('ready', this, false);
88	//Listening for library to be copied event (builds list)	88	//Listening for library to be copied event (builds list)
89	this.chromeFileSystem.addEventListener('library', this, false);	89	this.chromeFileSystem.addEventListener('library', this, false);
90	//TODO: Add sync loading screen logic (Add screen here)	90	//TODO: Add sync loading screen logic (Add screen here)
91	}	91	}
92	},	92	},
93	////////////////////////////////////////////////////////////////////	93	////////////////////////////////////////////////////////////////////
94	//	94	//
95	handleLibrary: {	95	handleLibrary: {
96	enumerable: false,	96	enumerable: false,
97	value: function (e) {	97	value: function (e) {
98	//Removing events	98	//Removing events
99	this.chromeFileSystem.removeEventListener('library', this, false);	99	this.chromeFileSystem.removeEventListener('library', this, false);
100	//Listening for synced library event	100	//Listening for synced library event
101	this.ninjaLibrary.addEventListener('sync', this, false);	101	this.ninjaLibrary.addEventListener('sync', this, false);
102	//Sending library to be synced to chrome	102	//Sending library to be synced to chrome
103	this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);	103	this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);
104		104
105	}	105	}
106	},	106	},
107	////////////////////////////////////////////////////////////////////	107	////////////////////////////////////////////////////////////////////
108	//	108	//
109	handleSync: {	109	handleSync: {
110	enumerable: false,	110	enumerable: false,
111	value: function (e) {	111	value: function (e) {
112	console.log('Ninja Local Library: Ready');	112	console.log('Ninja Local Library: Ready');
113	//Removing events	113	//Removing events
114	this.ninjaLibrary.removeEventListener('sync', this, false);	114	this.ninjaLibrary.removeEventListener('sync', this, false);
115	//TODO: Add sync loading screen logic (Remove screen here)	115	//TODO: Add sync loading screen logic (Remove screen here)
116	}	116	}
117	},	117	},
118	////////////////////////////////////////////////////////////////////	118	////////////////////////////////////////////////////////////////////
@@ -124,12 +124,12 @@ exports.CoreIoApi = Montage.create(Component, {
124	////////////////////////////////////////////////////////////////////	124	////////////////////////////////////////////////////////////////////
125	//	125	//
126	chromeNinjaLibrary: {	126	chromeNinjaLibrary: {
127	enumerable: false,	127	enumerable: false,
128	get: function() {	128	get: function() {
129	return this._chromeNinjaLibrary;	129	return this._chromeNinjaLibrary;
130	},	130	},
131	set: function(value) {	131	set: function(value) {
132	this._chromeNinjaLibrary = value;	132	this._chromeNinjaLibrary = value;
133	}	133	}
134	},	134	},
135	////////////////////////////////////////////////////////////////////	135	////////////////////////////////////////////////////////////////////
@@ -141,15 +141,15 @@ exports.CoreIoApi = Montage.create(Component, {
141	////////////////////////////////////////////////////////////////////	141	////////////////////////////////////////////////////////////////////
142	//	142	//
143	chromeFileSystem: {	143	chromeFileSystem: {
144	enumerable: false,	144	enumerable: false,
145	get: function() {	145	get: function() {
146	return this._chromeFileSystem;	146	return this._chromeFileSystem;
147	},	147	},
148	set: function(value) {	148	set: function(value) {
149	this._chromeFileSystem = value;	149	this._chromeFileSystem = value;
150	}	150	}
151	},	151	},
152	////////////////////////////////////////////////////////////////////	152	////////////////////////////////////////////////////////////////////
153	//	153	//
154	_ioServiceDetected: {	154	_ioServiceDetected: {
155	enumerable: false,	155	enumerable: false,
@@ -158,15 +158,15 @@ exports.CoreIoApi = Montage.create(Component, {
158	////////////////////////////////////////////////////////////////////	158	////////////////////////////////////////////////////////////////////
159	//Checking for service availability on boot	159	//Checking for service availability on boot
160	ioServiceDetected: {	160	ioServiceDetected: {
161	enumerable: false,	161	enumerable: false,
162	get: function() {	162	get: function() {
163	return this._ioServiceDetected;	163	return this._ioServiceDetected;
164	},	164	},
165	set: function(value) {	165	set: function(value) {
166	this._ioServiceDetected = value;	166	this._ioServiceDetected = value;
167	}	167	}
168	},	168	},
169	////////////////////////////////////////////////////////////////////	169	////////////////////////////////////////////////////////////////////
170	//Root API URL	170	//Root API URL
171	_rootUrl: {	171	_rootUrl: {
172	enumerable: false,	172	enumerable: false,
@@ -175,15 +175,15 @@ exports.CoreIoApi = Montage.create(Component, {
175	////////////////////////////////////////////////////////////////////	175	////////////////////////////////////////////////////////////////////
176	//	176	//
177	rootUrl: {	177	rootUrl: {
178	enumerable: false,	178	enumerable: false,
179	get: function() {	179	get: function() {
180	return this._rootUrl;	180	return this._rootUrl;
181	},	181	},
182	set: function(value) {	182	set: function(value) {
183	this._rootUrl = this.application.localStorage.setItem("ioRootUrl", value);	183	this._rootUrl = this.application.localStorage.setItem("ioRootUrl", value);
184	}	184	}
185	},	185	},
186	////////////////////////////////////////////////////////////////////	186	////////////////////////////////////////////////////////////////////