aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-16 10:06:10 -0700
committerJose Antonio Marquez2012-07-16 10:06:10 -0700
commit6572ede98706133d6dc6c5dca72f8ca0da1eb2fe (patch)
tree0e9661858c24ad658c1a6ea42631ff039e287213
parent2c5b9fac8a1085788ae00ecee527760e6c8953f6 (diff)
parent0ede302f0568cf25498cfa0f2aa9ce3686e84add (diff)
downloadninja-6572ede98706133d6dc6c5dca72f8ca0da1eb2fe.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
-rw-r--r--README.md18
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js1
2 files changed, 10 insertions, 9 deletions
diff --git a/README.md b/README.md
index ada4ce7e..4609102b 100644
--- a/README.md
+++ b/README.md
@@ -21,17 +21,17 @@ If you're already familiar with using Git, GitHub, you can clone master branch o
215. Load unpacked extension... and browse to your cloned master branch. 215. Load unpacked extension... and browse to your cloned master branch.
226. Copy Ninja app ID from the Extensions page under the app name. 226. Copy Ninja app ID from the Extensions page under the app name.
237. On Windows: 237. On Windows:
24 Click Start menu icon and type regedit 24 Click Start menu icon and type regedit.
25 Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options 25 Browse to HKEY_CURRENT_USER/Software/Motorola Mobility/Ninja Local Cloud/Options.
26 Right click and select New > String value 26 Right click and select New > String value.
27 Type 'Local Ninja Origin' no quotes 27 Type 'Local Ninja Origin' no quotes.
28 Double click on Local Ninja Origin and paste in the ID copied in step 6 in the Value data field. Close Registry Editor. 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. Close Registry Editor.
298. On Mac: 298. On Mac:
30 Launch Finder. 30 Launch Finder.
31 Double click on /Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist 31 Double click on /Users/\<user\>/Library/Preferences/com.MotorolaMobility.Ninja-Local-Cloud.plist.
32 Click on Add Child Type 'Local Ninja Origin' no quotes 32 Click on Add Child Type 'Local Ninja Origin' no quotes.
33 For value, paste in the ID copied in step 6. 33 For value, paste in the Ninja app ID copied in step 6 from the Chrome extensions page.
34 Save (File > Save or Cmd S) Close Property List Editor 34 Save (File > Save or Cmd S) Close Property List Editor.
359. Quit Ninja Local Cloud 359. Quit Ninja Local Cloud
3610. Launch Ninja Local Cloud 3610. Launch Ninja Local Cloud
3711. Click Copy button to copy the Ninja Local Cloud URL. 3711. Click Copy button to copy the Ninja Local Cloud URL.
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index d4611468..eecf7014 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -174,6 +174,7 @@ exports.GradientPicker = Montage.create(Component, {
174 button.stop = stop; 174 button.stop = stop;
175 tooltip.stop = stop; 175 tooltip.stop = stop;
176 holder.stop = stop; 176 holder.stop = stop;
177 stop.stop = stop;
177 stop.button = button; 178 stop.button = button;
178 //Adding stop to container 179 //Adding stop to container
179 this.trackChips.appendChild(stop); 180 this.trackChips.appendChild(stop);