Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ function RemoteFunctions(config = {}) {
screenOffset: screenOffset,
selectElement: selectElement,
isSelectedFromEditor: function () { return _selectedFromEditor; },
isNamedSelection: _isNamedSelection,
sendSelectionToEditor: sendSelectionToEditor,
brieflyDisableHoverListeners: brieflyDisableHoverListeners,
handleElementClick: handleElementClick,
Expand Down
9 changes: 5 additions & 4 deletions src/extensions/default/InlineColorEditor/ColorEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ define(function (require, exports, module) {
tinycolor = brackets.getModule("thirdparty/tinycolor");

/** Mustache template that forms the bare DOM structure of the UI */
var ColorEditorTemplate = require("text!ColorEditorTemplate.html");
var ColorEditorTemplate = require("text!./ColorEditorTemplate.html");

/**
* @const @type {number}
Expand Down Expand Up @@ -131,9 +131,10 @@ define(function (require, exports, module) {

this._redoColor = null;
this._isUpperCase = PreferencesManager.get("uppercaseColors");
PreferencesManager.on("change", "uppercaseColors", function () {
this._handleUppercaseColorsChange = function () {
this._isUpperCase = PreferencesManager.get("uppercaseColors");
}.bind(this));
}.bind(this);
PreferencesManager.on("change", "uppercaseColors", this._handleUppercaseColorsChange);

this.$colorValue = this.$element.find(".color-value");
this.$buttonList = this.$element.find("ul.button-bar");
Expand Down Expand Up @@ -270,7 +271,7 @@ define(function (require, exports, module) {
* Remove any preference listeners before destroying the editor.
*/
ColorEditor.prototype.destroy = function () {
PreferencesManager.off("change", "uppercaseColors");
PreferencesManager.off("change", "uppercaseColors", this._handleUppercaseColorsChange);
};

/**
Expand Down
14 changes: 13 additions & 1 deletion src/nls/root/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,18 @@ define({
"LIVE_PREVIEW_LAYERS_SCRIPT_GENERATED": "Generated by script, not in the source file",
"LIVE_PREVIEW_LAYERS_TAG_TOOLTIP": "Show Tag Name Tooltip",
"LIVE_PREVIEW_LAYERS_INSERT_ELEMENT": "Insert Element",
"LIVE_PREVIEW_LAYERS_CHANGE_COLOR": "Change color",
"LIVE_PREVIEW_LAYERS_COPY_DECLARATION": "Copy property",
"LIVE_PREVIEW_LAYERS_COPY_RULE": "Copy rule",
"LIVE_PREVIEW_LAYERS_PASTE_PROPERTIES": "Paste properties",
"LIVE_PREVIEW_LAYERS_PASTE": "Paste",
"LIVE_PREVIEW_LAYERS_STYLES_MENU_HINT": "Right-click to copy or paste styles",
"LIVE_PREVIEW_LAYERS_PASTE_INVALID": "Paste CSS properties or one complete selector at a time.",
"LIVE_PREVIEW_LAYERS_PASTE_FAILED": "Couldn’t paste these properties. Try again.",
"LIVE_PREVIEW_LAYERS_PASTED": "Properties pasted into {0}",
"LIVE_PREVIEW_LAYERS_COPY_FAILED": "Couldn’t copy these styles. Try again.",
"LIVE_PREVIEW_LAYERS_ADD_INLINE_STYLE": "Add Inline Style",
"LIVE_PREVIEW_LAYERS_INSERT_POSITION": "Placement",
"LIVE_PREVIEW_LAYERS_INSERT_INTO_PAGE": "Add to the page",
"LIVE_PREVIEW_LAYERS_INSERT_LOADING": "Loading elements…",
"LIVE_PREVIEW_LAYERS_INSERT_UNAVAILABLE": "The live preview did not answer. Try again in a moment.",
Expand All @@ -836,7 +848,7 @@ define({
"LIVE_PREVIEW_LAYERS_EMPTY_PAGE_PROPERTIES": "The page is empty. Add an element to see its properties.",
"LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "The page is empty. Add an element to see its styles.",
"LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Show the selected element",
"LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Drag to adjust, double-click to edit",
"LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Drag to adjust. Scroll or use arrow keys while editing. Shift: larger steps, Alt: smaller steps",
"LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "property",
"LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "value",

Expand Down
Loading
Loading