diff options
author | Jose Antonio Marquez | 2012-07-16 10:06:10 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-07-16 10:06:10 -0700 |
commit | 6572ede98706133d6dc6c5dca72f8ca0da1eb2fe (patch) | |
tree | 0e9661858c24ad658c1a6ea42631ff039e287213 | |
parent | 2c5b9fac8a1085788ae00ecee527760e6c8953f6 (diff) | |
parent | 0ede302f0568cf25498cfa0f2aa9ce3686e84add (diff) | |
download | ninja-6572ede98706133d6dc6c5dca72f8ca0da1eb2fe.tar.gz |
Merge branch 'refs/heads/Ninja-Master' into Document
-rw-r--r-- | README.md | 18 | ||||
-rwxr-xr-x | js/components/gradientpicker.reel/gradientpicker.js | 1 |
2 files changed, 10 insertions, 9 deletions
@@ -21,17 +21,17 @@ If you're already familiar with using Git, GitHub, you can clone master branch o | |||
21 | 5. Load unpacked extension... and browse to your cloned master branch. | 21 | 5. Load unpacked extension... and browse to your cloned master branch. |
22 | 6. Copy Ninja app ID from the Extensions page under the app name. | 22 | 6. Copy Ninja app ID from the Extensions page under the app name. |
23 | 7. On Windows: | 23 | 7. 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. |
29 | 8. On Mac: | 29 | 8. 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. |
35 | 9. Quit Ninja Local Cloud | 35 | 9. Quit Ninja Local Cloud |
36 | 10. Launch Ninja Local Cloud | 36 | 10. Launch Ninja Local Cloud |
37 | 11. Click Copy button to copy the Ninja Local Cloud URL. | 37 | 11. 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); |