Add color picker for Design Mode icons #7369
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey Josh, I'd be happy to look at this, however I'm under the gun to finish something this afternoon and on vacation tomorrow, so I may not be able to give it a thorough look until Monday morning. |
| var iconColorPicker; | ||
| var canonicalImage = element.getAttribute('data-canonical-image-url'); | ||
| if (ICON_PREFIX_REGEX.test(canonicalImage)) { | ||
|
|
There was a problem hiding this comment.
same in other jsx files
| @@ -180,13 +180,14 @@ designMode.onPropertyChange = function(element, name, value) { | |||
| * @param value {string} An icon identifier of the format "icon://fa-icon-name". | |||
| * @return {string} | |||
| */ | |||
| function renderIconToString(value) { | |||
| function renderIconToString(value, element) { | |||
There was a problem hiding this comment.
add @param for element
|
couple comments, but otherwise lgtm :) |
added 2 commits
March 17, 2016 16:18
Conflicts: apps/src/applab/designElements/button.jsx
joshlory
force-pushed
the
icon-color-picker
branch
from
8ac31ec
to
f4526fa
Compare
joshlory
pushed a commit
that referenced
this pull request
Mar 18, 2016
Add color picker for Design Mode icons
deploy-code-org
added a commit
that referenced
this pull request
Mar 18, 2016
26954f8 Merge pull request #7369 from code-dot-org/icon-color-picker (Josh Lory) 53cfb6e add column in cdo-languages for which languages are supported on hoc.com (Continuous Integration) 7ca9bc8 Merge pull request #7371 from code-dot-org/use-color-js (Brad Buchanan) 3761f86 fix path to unbreak build (Brent Van Minnen) f4526fa Merge branch 'staging' into icon-color-picker (Josh Lory) ba63a4d Code review feedback (Josh Lory) 42b176a Merge pull request #7367 from code-dot-org/generate-color-js (Brad Buchanan)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Users can now choose a fill color for Design Mode icons: