Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-07-17 09:30:22 -0700
committer: Jonathan Duran 2012-07-17 09:30:22 -0700
commit: 53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree: 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /README.md
parent: 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent: 5146f224258929415adf4a8022e492454b4e2476 (diff)
download: ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
1 files changed, 37 insertions, 34 deletions
diff --git a/README.md b/README.md
index c5ecd429..286a99ae 100644
--- a/README.md
+++ b/README.md
@@ -7,46 +7,49 @@
 To run the Ninja Application you will need the following:
-   Be able to access the Motorola internal network, using the blue port or VPN
 -   The latest stable version of Chrome
-   Ninja can be run in either a Chrome unpackaged application or packaged application (.crx). Instructions below
+-   Ninja can be run in either a Chrome unpacked application or packed application (.crx). Instructions below
-###Setup and Run Ninja as an unpackaged application
+###Setup and Run Ninja as an unpacked application
-If you're already familiar with using Git, GitHub, and how to configure a local web server,
+If you're already familiar with using Git, GitHub, you can clone master branch or download the source zip file.  To use the stable branch, select V0.7.0 branch.
-1.  Download Ninja Local Cloud:
+1.  Download Ninja Local Cloud: Win: download Ninja Local Cloud app from the Ninja CRX on Chrome webstore, https://chrome.google.com/webstore/detail/jjdndclgmfdgpiccmlamlicfjmkognne
-    Win: get Ninja Local Cloud.exe from \\ninjateam.am.mot.com\users\jmayhew\Ninja Local Cloud,
-    Mac: get Ninja Local Cloud.app from smb://ninjateam.am.mot.com/users/jmayhew/Ninja Local Cloud
 2.  Launch Ninja Local Cloud.  On Mac, click Allow when asked to accept incoming network connection.
-3.  Click Copy button to copy the Ninja Local Cloud URL.
+3.  In the Chrome browser, go to chrome://chrome/extensions/
-4.  Launch your cloned master branch.
+4.  Turn on Developer mode.
-5.  You should get the Cloud Service Dialog.
+5.  Load unpacked extension... and browse to your cloned master branch.
-6.  Paste in the Ninja Local Cloud URL that you copied in step 3.
+6.  Copy Ninja app ID from the Extensions page under the app name.
-7.  Click the TEST button.  It should still show Disconnected.
+7. On Windows:
-8.  In the Ninja Local Cloud app, click on Advanced button, you should see an error that it ignores the url where you run Ninja.  If you don't any text when clicking Test, there's no connection established between Ninja and Ninja Local Cloud, you probably did not click Allow the incoming connection, or check your network connection, try public network instead of DSA, disconnect from VPN, etc.
+    - Click Start menu icon and type regedit.
-9.  Copy the URL in the error text, this is also the URL of where you run your Ninja build, something like http://localhost:9080 on Windows or http://yourmachinename.am.mot.com on Mac
+    - Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options.
-10. On Windows:
+    - Right click and select New > String value.
-    Click Start menu icon and type regedit
+    - Type 'Local Ninja Origin' no quotes.
-    Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options
+    - Double click on Local Ninja Origin and paste in the Ninja app ID copied in step 6 from the Chrome extensions page in the Value data field. 
-    Right click and select New > String value
+    - Close Registry Editor.
-    Type 'Local Ninja Origin' no quotes
+8. On Mac:
-    Double click on Local Ninja Origin and paste in the URL copied in step 10 in the Value data field.
+    - Launch Finder.
-    Close Registry Editor.
+    - Double click on /Users/\<user\>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist.  Note: on Lion (10.7), user library folder is hidden by default.  To browse to it, in Finder choose Go > Go to Folder and type ~/Library, or select Go menu with Alt (Option) key down to see Library listed in Go menu or make the user library folder permanently visible by running the following command in Terminal: chflags nohidden ~/Library
+    - Click on Add Child Type 'Local Ninja Origin' no quotes.
-11. On Mac:
+    - For value, paste in the Ninja app ID copied in step 6 from the Chrome extensions page.
-    Launch Finder.
+    - Save (File > Save or Cmd S).
-    Double click on <yourusername>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist
+    - Close Property List Editor.
-    Click on Add Child
+9.  Quit Ninja Local Cloud
-    Type  'Local Ninja Origin' no quotes
+10. Launch Ninja Local Cloud
-    For value, paste in the URL copied in step 10.
+11. Click Copy button to copy the Ninja Local Cloud URL.
-    Save (File > Save or Cmd S)
+12. New tab in Chrome and launch the Ninja app.
-    Close Property List Editor
+13. Paste in the Ninja Local Cloud URL that you copied in step 11 in the Cloud Service dialog in Ninja.
-12. Quit Ninja Local Cloud
+14. Click the TEST button, you should see the green text that said "Connected to Ninja Local Cloud".
-13. Launch Ninja Local Cloud
-14. In Ninja, click Test again, you should see the green text that said "Connected to Ninja Local Cloud".
 15. Ninja is opened with no document.  You should be able to do File > New File and select Basic HTML, give it a name and click browse to the directory.  By default, files will be saved in Ninja Projects folder in user documents.  As long as Ninja Local Cloud is running, you will not see the Cloud Service Dialog next time you launch.
-###Setup and Run Ninja as a packaged application
+###Setup and Run Ninja as a packaged application (from Chrome Webstore)
+1.  Get Ninja Authoring Tool from Chrome Webstore, https://chrome.google.com/webstore/detail/jjdndclgmfdgpiccmlamlicfjmkognne or search for 'Ninja Authoring'.
+2.  New tab in Chrome and launch the Ninja app.
+3.  In the Cloud Service dialog, download the Ninja Local Cloud app.
+4.  Launch Ninja Local Cloud
+5.  Click Copy button to copy the Ninja Local Cloud URL.
+6.  Paste in the Ninja Local Cloud URL that you copied in step 5 in the Cloud Service dialog in Ninja.
+7.  Click the TEST button, you should see the green text that said "Connected to Ninja Local Cloud".
+8.  Ninja is opened with no document.  You should be able to do File > New File and select Basic HTML, give it a name and click browse to the directory.  By default, files will be saved in Ninja Projects folder in user documents.  As long as Ninja Local Cloud is running, you will not see the Cloud Service Dialog next time you launch.
author	Jonathan Duran	2012-07-17 09:30:22 -0700
committer	Jonathan Duran	2012-07-17 09:30:22 -0700
commit	53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree	79d542ee811044e8af2ef84aa0d6662c6eb895c4 /README.md
parent	7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent	5146f224258929415adf4a8022e492454b4e2476 (diff)
download	ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz

diff --git a/README.md b/README.md index c5ecd429..286a99ae 100644 --- a/README.md +++ b/README.md
@@ -7,46 +7,49 @@
7		7
8	To run the Ninja Application you will need the following:	8	To run the Ninja Application you will need the following:
9		9
10	- Be able to access the Motorola internal network, using the blue port or VPN
11	- The latest stable version of Chrome	10	- The latest stable version of Chrome
12	- Ninja can be run in either a Chrome unpackaged application or packaged application (.crx). Instructions below	11	- Ninja can be run in either a Chrome unpacked application or packed application (.crx). Instructions below
13		12
14	###Setup and Run Ninja as an unpackaged application	13	###Setup and Run Ninja as an unpacked application
15		14
16	If you're already familiar with using Git, GitHub, and how to configure a local web server,	15	If you're already familiar with using Git, GitHub, you can clone master branch or download the source zip file. To use the stable branch, select V0.7.0 branch.
17		16
18	1. Download Ninja Local Cloud:	17	1. Download Ninja Local Cloud: Win: download Ninja Local Cloud app from the Ninja CRX on Chrome webstore, https://chrome.google.com/webstore/detail/jjdndclgmfdgpiccmlamlicfjmkognne
19	Win: get Ninja Local Cloud.exe from \\ninjateam.am.mot.com\users\jmayhew\Ninja Local Cloud,
20	Mac: get Ninja Local Cloud.app from smb://ninjateam.am.mot.com/users/jmayhew/Ninja Local Cloud
21	2. Launch Ninja Local Cloud. On Mac, click Allow when asked to accept incoming network connection.	18	2. Launch Ninja Local Cloud. On Mac, click Allow when asked to accept incoming network connection.
22	3. Click Copy button to copy the Ninja Local Cloud URL.	19	3. In the Chrome browser, go to chrome://chrome/extensions/
23	4. Launch your cloned master branch.	20	4. Turn on Developer mode.
24	5. You should get the Cloud Service Dialog.	21	5. Load unpacked extension... and browse to your cloned master branch.
25	6. Paste in the Ninja Local Cloud URL that you copied in step 3.	22	6. Copy Ninja app ID from the Extensions page under the app name.
26	7. Click the TEST button. It should still show Disconnected.	23	7. On Windows:
27	8. In the Ninja Local Cloud app, click on Advanced button, you should see an error that it ignores the url where you run Ninja. If you don't any text when clicking Test, there's no connection established between Ninja and Ninja Local Cloud, you probably did not click Allow the incoming connection, or check your network connection, try public network instead of DSA, disconnect from VPN, etc.	24	- Click Start menu icon and type regedit.
28	9. Copy the URL in the error text, this is also the URL of where you run your Ninja build, something like http://localhost:9080 on Windows or http://yourmachinename.am.mot.com on Mac	25	- Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options.
29	10. On Windows:	26	- Right click and select New > String value.
30	Click Start menu icon and type regedit	27	- Type 'Local Ninja Origin' no quotes.
31	Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options	28	- Double click on Local Ninja Origin and paste in the Ninja app ID copied in step 6 from the Chrome extensions page in the Value data field.
32	Right click and select New > String value	29	- Close Registry Editor.
33	Type 'Local Ninja Origin' no quotes	30	8. On Mac:
34	Double click on Local Ninja Origin and paste in the URL copied in step 10 in the Value data field.	31	- Launch Finder.
35	Close Registry Editor.	32	- Double click on /Users/\<user\>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist. Note: on Lion (10.7), user library folder is hidden by default. To browse to it, in Finder choose Go > Go to Folder and type ~/Library, or select Go menu with Alt (Option) key down to see Library listed in Go menu or make the user library folder permanently visible by running the following command in Terminal: chflags nohidden ~/Library
36		33	- Click on Add Child Type 'Local Ninja Origin' no quotes.
37	11. On Mac:	34	- For value, paste in the Ninja app ID copied in step 6 from the Chrome extensions page.
38	Launch Finder.	35	- Save (File > Save or Cmd S).
39	Double click on <yourusername>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist	36	- Close Property List Editor.
40	Click on Add Child	37	9. Quit Ninja Local Cloud
41	Type 'Local Ninja Origin' no quotes	38	10. Launch Ninja Local Cloud
42	For value, paste in the URL copied in step 10.	39	11. Click Copy button to copy the Ninja Local Cloud URL.
43	Save (File > Save or Cmd S)	40	12. New tab in Chrome and launch the Ninja app.
44	Close Property List Editor	41	13. Paste in the Ninja Local Cloud URL that you copied in step 11 in the Cloud Service dialog in Ninja.
45	12. Quit Ninja Local Cloud	42	14. Click the TEST button, you should see the green text that said "Connected to Ninja Local Cloud".
46	13. Launch Ninja Local Cloud
47	14. In Ninja, click Test again, you should see the green text that said "Connected to Ninja Local Cloud".
48	15. Ninja is opened with no document. You should be able to do File > New File and select Basic HTML, give it a name and click browse to the directory. By default, files will be saved in Ninja Projects folder in user documents. As long as Ninja Local Cloud is running, you will not see the Cloud Service Dialog next time you launch.	43	15. Ninja is opened with no document. You should be able to do File > New File and select Basic HTML, give it a name and click browse to the directory. By default, files will be saved in Ninja Projects folder in user documents. As long as Ninja Local Cloud is running, you will not see the Cloud Service Dialog next time you launch.
49		44
50		45
51	###Setup and Run Ninja as a packaged application	46	###Setup and Run Ninja as a packaged application (from Chrome Webstore)
52		47
		48	1. Get Ninja Authoring Tool from Chrome Webstore, https://chrome.google.com/webstore/detail/jjdndclgmfdgpiccmlamlicfjmkognne or search for 'Ninja Authoring'.
		49	2. New tab in Chrome and launch the Ninja app.
		50	3. In the Cloud Service dialog, download the Ninja Local Cloud app.
		51	4. Launch Ninja Local Cloud
		52	5. Click Copy button to copy the Ninja Local Cloud URL.
		53	6. Paste in the Ninja Local Cloud URL that you copied in step 5 in the Cloud Service dialog in Ninja.
		54	7. Click the TEST button, you should see the green text that said "Connected to Ninja Local Cloud".
		55	8. Ninja is opened with no document. You should be able to do File > New File and select Basic HTML, give it a name and click browse to the directory. By default, files will be saved in Ninja Projects folder in user documents. As long as Ninja Local Cloud is running, you will not see the Cloud Service Dialog next time you launch.