From 3080fb557b1f170dfcf9dcd85359919c80b9dc17 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 22 Aug 2025 23:36:59 +0530 Subject: [PATCH 001/849] feat: add placeholder tab to working set when save is clicked --- src/command/Menus.js | 4 +-- src/extensionsIntegrated/TabBar/main.js | 42 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/command/Menus.js b/src/command/Menus.js index b1c137b621..30e358df89 100644 --- a/src/command/Menus.js +++ b/src/command/Menus.js @@ -737,12 +737,12 @@ define(function (require, exports, module) { logger.leaveTrail("UI Menu Click: " + menuItem._command.getID()); MainViewManager.focusActivePane(); if (menuItem._command._options.eventSource) { - menuItem._command.execute({ + CommandManager.execute(menuItem._command.getID(), { eventSource: CommandManager.SOURCE_UI_MENU_CLICK, sourceType: self.id }); } else { - menuItem._command.execute(); + CommandManager.execute(menuItem._command.getID()); } }); diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 9c43888f3f..5f8f1b76f0 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -547,6 +547,44 @@ define(function (require, exports, module) { // the event fires too frequently when switching editors, leading to unexpected behavior const debounceUpdateTabs = _.debounce(updateTabs, 2); + /** + * This function is responsible to add the placeholder tab to the working set (if user press save on it) + * @param {Event} event + * @param {String} commandId - the command id, to make sure we check it do the operation only on file save + */ + function onFileSave(event, commandId) { + if (commandId === Commands.FILE_SAVE || commandId === Commands.FILE_SAVE_ALL) { + const activePane = MainViewManager.getActivePaneId(); + const currentFile = MainViewManager.getCurrentlyViewedFile(activePane); + + if (currentFile) { + const filePath = currentFile.fullPath; + + // check if this file is currently shown as a placeholder in any pane + const isFirstPanePlaceholder = + MainViewManager.getCurrentlyViewedFile("first-pane") && + MainViewManager.getCurrentlyViewedFile("first-pane").fullPath === filePath && + !Global.firstPaneWorkingSet.some((entry) => entry.path === filePath); + + const isSecondPanePlaceholder = + MainViewManager.getCurrentlyViewedFile("second-pane") && + MainViewManager.getCurrentlyViewedFile("second-pane").fullPath === filePath && + !Global.secondPaneWorkingSet.some((entry) => entry.path === filePath); + + // if it's a placeholder tab, we add it to the working set + if (isFirstPanePlaceholder) { + const fileObj = FileSystem.getFileForPath(filePath); + MainViewManager.addToWorkingSet("first-pane", fileObj); + } + + if (isSecondPanePlaceholder) { + const fileObj = FileSystem.getFileForPath(filePath); + MainViewManager.addToWorkingSet("second-pane", fileObj); + } + } + } + } + /** * Registers the event handlers */ @@ -588,6 +626,10 @@ define(function (require, exports, module) { // main-plugin-panel[0] = live preview panel new ResizeObserver(updateTabs).observe($("#main-plugin-panel")[0]); + // listen for file save commands, needed to add placeholder tab to the working set + CommandManager.off("beforeExecuteCommand", onFileSave); + CommandManager.on("beforeExecuteCommand", onFileSave); + // File dirty flag change handling DocumentManager.on("dirtyFlagChange", function (event, doc) { const filePath = doc.file.fullPath; From 6e2c3dc93b45fd08858ccb0891ea315af38d01d5 Mon Sep 17 00:00:00 2001 From: abose Date: Thu, 3 Jul 2025 10:37:48 +0530 Subject: [PATCH 002/849] feat: live preview hover inspect ui initial --- .../BrowserScripts/RemoteFunctions.js | 136 +++++++++++------- src/LiveDevelopment/main.js | 8 +- src/nls/root/strings.js | 2 +- 3 files changed, 91 insertions(+), 55 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index bec0f1905e..95c283b055 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -33,20 +33,20 @@ function RemoteFunctions(config) { var experimental; if (!config) { - experimental = false; + experimental = false; } else { - experimental = config.experimental; + experimental = config.experimental; } var req, timeout; var animateHighlight = function (time) { if(req) { - window.cancelAnimationFrame(req); + window.cancelAnimationFrame(req); window.clearTimeout(timeout); } req = window.requestAnimationFrame(redrawHighlights); timeout = setTimeout(function () { - window.cancelAnimationFrame(req); + window.cancelAnimationFrame(req); req = null; }, time * 1000); }; @@ -113,7 +113,7 @@ function RemoteFunctions(config) { element.removeAttribute(key); } } - + // Checks if the element is in Viewport in the client browser function isInViewport(element) { var rect = element.getBoundingClientRect(); @@ -125,7 +125,7 @@ function RemoteFunctions(config) { rect.right <= (window.innerWidth || html.clientWidth) ); } - + // returns the distance from the top of the closest relatively positioned parent element function getDocumentOffsetTop(element) { return element.offsetTop + (element.offsetParent ? getDocumentOffsetTop(element.offsetParent) : 0); @@ -273,7 +273,7 @@ function RemoteFunctions(config) { animationDuration = parseFloat(elementStyling.getPropertyValue('animation-duration')); highlight.trackingElement = element; // save which node are we highlighting - + if (transitionDuration) { animateHighlight(transitionDuration); } @@ -286,21 +286,21 @@ function RemoteFunctions(config) { if (elementBounds.width === 0 && elementBounds.height === 0) { return; } - + var realElBorder = { right: elementStyling.getPropertyValue('border-right-width'), left: elementStyling.getPropertyValue('border-left-width'), top: elementStyling.getPropertyValue('border-top-width'), bottom: elementStyling.getPropertyValue('border-bottom-width') }; - + var borderBox = elementStyling.boxSizing === 'border-box'; - + var innerWidth = parseFloat(elementStyling.width), innerHeight = parseFloat(elementStyling.height), outerHeight = innerHeight, outerWidth = innerWidth; - + if (!borderBox) { innerWidth += parseFloat(elementStyling.paddingLeft) + parseFloat(elementStyling.paddingRight); innerHeight += parseFloat(elementStyling.paddingTop) + parseFloat(elementStyling.paddingBottom); @@ -309,49 +309,49 @@ function RemoteFunctions(config) { outerHeight = innerHeight + parseFloat(realElBorder.bottom) + parseFloat(realElBorder.top); } - + var visualisations = { horizontal: "left, right", vertical: "top, bottom" }; - + var drawPaddingRect = function(side) { var elStyling = {}; - + if (visualisations.horizontal.indexOf(side) >= 0) { elStyling['width'] = elementStyling.getPropertyValue('padding-' + side); elStyling['height'] = innerHeight + "px"; elStyling['top'] = 0; - + if (borderBox) { elStyling['height'] = innerHeight - parseFloat(realElBorder.top) - parseFloat(realElBorder.bottom) + "px"; } - + } else { - elStyling['height'] = elementStyling.getPropertyValue('padding-' + side); + elStyling['height'] = elementStyling.getPropertyValue('padding-' + side); elStyling['width'] = innerWidth + "px"; elStyling['left'] = 0; - + if (borderBox) { elStyling['width'] = innerWidth - parseFloat(realElBorder.left) - parseFloat(realElBorder.right) + "px"; } } - + elStyling[side] = 0; elStyling['position'] = 'absolute'; - + return elStyling; }; - + var drawMarginRect = function(side) { var elStyling = {}; - + var margin = []; margin['right'] = parseFloat(elementStyling.getPropertyValue('margin-right')); margin['top'] = parseFloat(elementStyling.getPropertyValue('margin-top')); margin['bottom'] = parseFloat(elementStyling.getPropertyValue('margin-bottom')); margin['left'] = parseFloat(elementStyling.getPropertyValue('margin-left')); - + if(visualisations['horizontal'].indexOf(side) >= 0) { elStyling['width'] = elementStyling.getPropertyValue('margin-' + side); @@ -371,37 +371,37 @@ function RemoteFunctions(config) { var setVisibility = function (el) { if ( - !config.remoteHighlight.showPaddingMargin || - parseInt(el.height, 10) <= 0 || - parseInt(el.width, 10) <= 0 + !config.remoteHighlight.showPaddingMargin || + parseInt(el.height, 10) <= 0 || + parseInt(el.width, 10) <= 0 ) { el.display = 'none'; } else { el.display = 'block'; } }; - + var mainBoxStyles = config.remoteHighlight.stylesToSet; - + var paddingVisualisations = [ drawPaddingRect('top'), drawPaddingRect('right'), drawPaddingRect('bottom'), - drawPaddingRect('left') + drawPaddingRect('left') ]; - + var marginVisualisations = [ drawMarginRect('top'), drawMarginRect('right'), drawMarginRect('bottom'), - drawMarginRect('left') + drawMarginRect('left') ]; - + var setupVisualisations = function (arr, config) { var i; for (i = 0; i < arr.length; i++) { setVisibility(arr[i]); - + // Applies to every visualisationElement (padding or margin div) arr[i]["transform"] = "none"; var el = window.document.createElement("div"), @@ -416,7 +416,7 @@ function RemoteFunctions(config) { highlight.appendChild(el); } }; - + setupVisualisations( marginVisualisations, config.remoteHighlight.marginStyling @@ -425,11 +425,11 @@ function RemoteFunctions(config) { paddingVisualisations, config.remoteHighlight.paddingStyling ); - + highlight.className = HIGHLIGHT_CLASSNAME; var offset = _screenOffset(element); - + // some code to find element left/top was removed here. This seems to be relevant to box model // live highlights. firether reading: https://github.com/adobe/brackets/pull/13357/files // we removed this in phoenix because it was throwing the rendering of live highlight boxes in phonix @@ -448,14 +448,14 @@ function RemoteFunctions(config) { "position": "absolute", "pointer-events": "none", "box-shadow": "0 0 1px #fff", - "box-sizing": elementStyling.getPropertyValue('box-sizing'), - "border-right": elementStyling.getPropertyValue('border-right'), - "border-left": elementStyling.getPropertyValue('border-left'), - "border-top": elementStyling.getPropertyValue('border-top'), + "box-sizing": elementStyling.getPropertyValue('box-sizing'), + "border-right": elementStyling.getPropertyValue('border-right'), + "border-left": elementStyling.getPropertyValue('border-left'), + "border-top": elementStyling.getPropertyValue('border-top'), "border-bottom": elementStyling.getPropertyValue('border-bottom'), "border-color": config.remoteHighlight.borderColor }; - + var mergedStyles = Object.assign({}, stylesToSet, config.remoteHighlight.stylesToSet); var animateStartValues = config.remoteHighlight.animateStartValue; @@ -500,7 +500,7 @@ function RemoteFunctions(config) { if (this.trigger) { _trigger(element, "highlight", 1); } - + if ((!window.event || window.event instanceof MessageEvent) && !isInViewport(element)) { var top = getDocumentOffsetTop(element); if (top) { @@ -563,6 +563,8 @@ function RemoteFunctions(config) { var _localHighlight; var _remoteHighlight; + var _hoverHighlight; + var _clickHighlight; var _setup = false; @@ -585,6 +587,19 @@ function RemoteFunctions(config) { window.document.removeEventListener("mousemove", onMouseMove); } + function onElementHover(event) { + if (_hoverHighlight) { + _hoverHighlight.clear(); + _hoverHighlight.add(event.target, false); + } + } + + function onElementHoverOut() { + if (_hoverHighlight) { + _hoverHighlight.clear(); + } + } + function onClick(event) { if (_validEvent(event)) { event.preventDefault(); @@ -643,17 +658,24 @@ function RemoteFunctions(config) { _remoteHighlight.clear(); _remoteHighlight = null; } + if (_clickHighlight) { + _clickHighlight.clear(); + _clickHighlight = null; + } + if (_hoverHighlight) { + _hoverHighlight.clear(); + } } // highlight a node function highlight(node, clear) { - if (!_remoteHighlight) { - _remoteHighlight = new Highlight("#cfc"); + if (!_clickHighlight) { + _clickHighlight = new Highlight("#cfc"); } if (clear) { - _remoteHighlight.clear(); + _clickHighlight.clear(); } - _remoteHighlight.add(node, true); + _clickHighlight.add(node, true); } // highlight a rule @@ -663,7 +685,7 @@ function RemoteFunctions(config) { for (i = 0; i < nodes.length; i++) { highlight(nodes[i]); } - _remoteHighlight.selector = rule; + _clickHighlight.selector = rule; } // redraw active highlights @@ -671,6 +693,12 @@ function RemoteFunctions(config) { if (_remoteHighlight) { _remoteHighlight.redraw(); } + if (_clickHighlight) { + _clickHighlight.redraw(); + } + if (_hoverHighlight) { + _hoverHighlight.redraw(); + } } window.addEventListener("resize", redrawHighlights); @@ -683,7 +711,7 @@ function RemoteFunctions(config) { if (e.target === window.document) { redrawHighlights(); } else { - if (_remoteHighlight || _localHighlight) { + if (_remoteHighlight || _localHighlight || _clickHighlight || _hoverHighlight) { window.setTimeout(redrawHighlights, 0); } } @@ -985,7 +1013,7 @@ function RemoteFunctions(config) { function getSimpleDOM() { return JSON.stringify(_domElementToJSON(window.document.documentElement)); } - + function updateConfig(newConfig) { config = JSON.parse(newConfig); return JSON.stringify(config); @@ -994,6 +1022,16 @@ function RemoteFunctions(config) { // init _editHandler = new DOMEditHandler(window.document); + // Initialize hover highlight with Chrome-like colors + _hoverHighlight = new Highlight("#c8f9c5", true); // Green similar to Chrome's padding color + + // Initialize click highlight with animation + _clickHighlight = new Highlight("#cfc", true); // Light green for click highlight + + // Add event listeners for hover + window.document.addEventListener("mouseover", onElementHover); + window.document.addEventListener("mouseout", onElementHoverOut); + if (experimental) { window.document.addEventListener("keydown", onKeyDown); } diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 7d85eeab5f..3a5c27405a 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -79,14 +79,12 @@ define(function main(require, exports, module) { "opacity": 0.6 }, "paddingStyling": { - "border-width": "1px", - "border-style": "dashed", - "border-color": "rgba(0, 162, 255, 0.5)" + "background-color": "rgba(200, 249, 197, 0.7)" }, "marginStyling": { - "background-color": "rgba(21, 165, 255, 0.58)" + "background-color": "rgba(249, 204, 157, 0.7)" }, - "borderColor": "rgba(21, 165, 255, 0.85)", + "borderColor": "rgba(200, 249, 197, 0.85)", "showPaddingMargin": true }, { description: Strings.DESCRIPTION_LIVE_DEV_HIGHLIGHT_SETTINGS diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 1155d661b3..88c738c16d 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -328,7 +328,7 @@ define({ "SPLITVIEW_MENU_TOOLTIP": "Split the editor vertically or horizontally", "GEAR_MENU_TOOLTIP": "Configure Working Set", - "CMD_TOGGLE_SHOW_WORKING_SET": "Show Working Set", + "CMD_TOGGLE_SHOW_WORKING_SET": "Show Working Files", "CMD_TOGGLE_SHOW_FILE_TABS": "Show File Tab Bar", "SPLITVIEW_INFO_TITLE": "Already Open", From c8a071060a8e794372f3b606ea4578df41b8c2e9 Mon Sep 17 00:00:00 2001 From: abose Date: Thu, 3 Jul 2025 11:24:32 +0530 Subject: [PATCH 003/849] feat: live preview hover highlights improved --- .../BrowserScripts/RemoteFunctions.js | 145 +++++++++++++++++- src/LiveDevelopment/main.js | 3 + 2 files changed, 144 insertions(+), 4 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 95c283b055..3af92e25b5 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -212,6 +212,80 @@ function RemoteFunctions(config) { }; + // Node info box to display DOM node ID and classes on hover + function NodeInfoBox(element) { + this.element = element; + this.remove = this.remove.bind(this); + this.create(); + } + + NodeInfoBox.prototype = { + create: function() { + // Remove existing info box if any + this.remove(); + + // compute the position on screen + var offset = _screenOffset(this.element), + x = offset.left, + y = offset.top - 30; // Position above the element + + // create the container + this.body = window.document.createElement("div"); + this.body.style.setProperty("z-index", 2147483647); + this.body.style.setProperty("position", "fixed"); + this.body.style.setProperty("left", (offset.left) + "px"); + this.body.style.setProperty("top", (offset.top - 30 < 0 ? offset.top + this.element.offsetHeight + 5 : offset.top - 30) + "px"); + this.body.style.setProperty("font-size", "12px"); + this.body.style.setProperty("font-family", "Arial, sans-serif"); + + // Style the info box with a blue background + this.body.style.setProperty("background", "#4285F4"); + this.body.style.setProperty("color", "white"); + this.body.style.setProperty("border-radius", "3px"); + this.body.style.setProperty("padding", "5px 8px"); + this.body.style.setProperty("box-shadow", "0 2px 5px rgba(0,0,0,0.2)"); + this.body.style.setProperty("max-width", "300px"); + this.body.style.setProperty("pointer-events", "none"); // Make it non-interactive + + // Get element ID and classes + var id = this.element.id; + var classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; + + // Create content for the info box + var content = ""; + + // Add element tag name + content += "
" + this.element.tagName.toLowerCase() + "
"; + + // Add ID if present + if (id) { + content += "
#" + id + "
"; + } + + // Add classes (limit to 3 with dropdown indicator) + if (classes.length > 0) { + content += "
"; + for (var i = 0; i < Math.min(classes.length, 3); i++) { + content += "." + classes[i] + " "; + } + if (classes.length > 3) { + content += "+" + (classes.length - 3) + " more"; + } + content += "
"; + } + + this.body.innerHTML = content; + window.document.body.appendChild(this.body); + }, + + remove: function() { + if (this.body && this.body.parentNode) { + window.document.body.removeChild(this.body); + this.body = null; + } + } + }; + function Editor(element) { this.onBlur = this.onBlur.bind(this); this.onKeyPress = this.onKeyPress.bind(this); @@ -565,6 +639,7 @@ function RemoteFunctions(config) { var _remoteHighlight; var _hoverHighlight; var _clickHighlight; + var _nodeInfoBox; var _setup = false; @@ -572,7 +647,11 @@ function RemoteFunctions(config) { function onMouseOver(event) { if (_validEvent(event)) { - _localHighlight.add(event.target, true); + // Skip highlighting for HTML and BODY tags + if (event.target && event.target.nodeType === Node.ELEMENT_NODE && + event.target.tagName !== "HTML" && event.target.tagName !== "BODY") { + _localHighlight.add(event.target, true); + } } } @@ -590,14 +669,45 @@ function RemoteFunctions(config) { function onElementHover(event) { if (_hoverHighlight) { _hoverHighlight.clear(); - _hoverHighlight.add(event.target, false); + + // Skip highlighting for HTML and BODY tags + if (event.target && event.target.nodeType === Node.ELEMENT_NODE && + event.target.tagName !== "HTML" && event.target.tagName !== "BODY") { + // Store original background color to restore on hover out + event.target._originalBackgroundColor = event.target.style.backgroundColor; + event.target.style.backgroundColor = "rgba(0, 162, 255, 0.2)"; + + _hoverHighlight.add(event.target, false); + + // Create info box for the hovered element + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + } + _nodeInfoBox = new NodeInfoBox(event.target); + } } } - function onElementHoverOut() { + function onElementHoverOut(event) { if (_hoverHighlight) { _hoverHighlight.clear(); } + + // Restore original background color + if (event && event.target && event.target.nodeType === Node.ELEMENT_NODE) { + if (event.target._originalBackgroundColor !== undefined) { + event.target.style.backgroundColor = event.target._originalBackgroundColor; + delete event.target._originalBackgroundColor; + } else { + event.target.style.backgroundColor = ""; + } + } + + // Remove info box when mouse leaves the element + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = null; + } } function onClick(event) { @@ -665,6 +775,10 @@ function RemoteFunctions(config) { if (_hoverHighlight) { _hoverHighlight.clear(); } + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = null; + } } // highlight a node @@ -675,7 +789,11 @@ function RemoteFunctions(config) { if (clear) { _clickHighlight.clear(); } - _clickHighlight.add(node, true); + // Skip highlighting for HTML and BODY tags + if (node && node.nodeType === Node.ELEMENT_NODE && + node.tagName !== "HTML" && node.tagName !== "BODY") { + _clickHighlight.add(node, true); + } } // highlight a rule @@ -1015,7 +1133,26 @@ function RemoteFunctions(config) { } function updateConfig(newConfig) { + var oldConfig = config; config = JSON.parse(newConfig); + + if (config.highlight) { + // Add hover event listeners if highlight is enabled + window.document.removeEventListener("mouseover", onElementHover); + window.document.removeEventListener("mouseout", onElementHoverOut); + window.document.addEventListener("mouseover", onElementHover); + window.document.addEventListener("mouseout", onElementHoverOut); + } else { + // Remove hover event listeners if highlight is disabled + window.document.removeEventListener("mouseover", onElementHover); + window.document.removeEventListener("mouseout", onElementHoverOut); + + // Remove info box if highlight is disabled + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = null; + } + } return JSON.stringify(config); } diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 3a5c27405a..6d7cb962c9 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -298,6 +298,9 @@ define(function main(require, exports, module) { .on("change", function () { config.highlight = PreferencesManager.getViewState("livedevHighlight"); _updateHighlightCheckmark(); + if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) { + MultiBrowserLiveDev.agents.remote.call("updateConfig",JSON.stringify(config)); + } }); config.highlight = PreferencesManager.getViewState("livedevHighlight"); From addf4c2d1d83c07d67d83513d86e56f92feb3b07 Mon Sep 17 00:00:00 2001 From: abose Date: Sun, 6 Jul 2025 12:56:52 +0530 Subject: [PATCH 004/849] feat: element selection and content editable setting --- .../BrowserScripts/LiveDevProtocolRemote.js | 59 +++++++++---- .../BrowserScripts/RemoteFunctions.js | 83 ++++++++++++++++++- 2 files changed, 124 insertions(+), 18 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js index 0731a1f86e..f83477f7ad 100644 --- a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js +++ b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js @@ -390,25 +390,50 @@ function onDocumentClick(event) { // Get the user's current selection const selection = window.getSelection(); - - // Check if there is a selection - if (selection.toString().length > 0) { - // if there is any selection like text or others, we don't see it as a live selection event - // Eg: user may selects ome text in live preview to copy, in which case we should nt treat it - // as a live select. - return; - } var element = event.target; if (element && element.hasAttribute('data-brackets-id')) { - MessageBroker.send({ - "tagId": element.getAttribute('data-brackets-id'), - "nodeID": element.id, - "nodeClassList": element.classList, - "nodeName": element.nodeName, - "allSelectors": _getAllInheritedSelectorsInOrder(element), - "contentEditable": element.contentEditable === 'true', - "clicked": true - }); + // Check if it's a double-click for direct editing + if (event.detail === 2 && element.textContent && !['INPUT', 'TEXTAREA', 'SELECT'].includes(element.tagName)) { + // Double-click detected, enable direct editing + // Make the element editable + if (window._LD && window._LD.DOMEditHandler) { + // Use the existing DOMEditHandler to handle the edit + window._LD.startEditing(element); + } else { + MessageBroker.send({ + "tagId": element.getAttribute('data-brackets-id'), + "nodeID": element.id, + "nodeClassList": element.classList, + "nodeName": element.nodeName, + "allSelectors": _getAllInheritedSelectorsInOrder(element), + "contentEditable": element.contentEditable === 'true', + "clicked": true, + "edit": true + }); + } + + // Prevent default behavior and stop propagation + event.preventDefault(); + event.stopPropagation(); + } else { + // Regular click, just send the information + // Check if there is a selection + if (selection.toString().length > 0) { + // if there is any selection like text or others, we don't see it as a live selection event + // Eg: user may selects ome text in live preview to copy, in which case we should nt treat it + // as a live select. + return; + } + MessageBroker.send({ + "tagId": element.getAttribute('data-brackets-id'), + "nodeID": element.id, + "nodeClassList": element.classList, + "nodeName": element.nodeName, + "allSelectors": _getAllInheritedSelectorsInOrder(element), + "contentEditable": element.contentEditable === 'true', + "clicked": true + }); + } } } window.document.addEventListener("click", onDocumentClick); diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 3af92e25b5..5bfacb94cf 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1156,6 +1156,85 @@ function RemoteFunctions(config) { return JSON.stringify(config); } + // Function to handle direct editing of elements in the live preview + function startEditing(element) { + if (!element) { + return; + } + + // Make the element editable + element.setAttribute("contenteditable", "true"); + element.focus(); + + // Save the original content for potential cancellation + element._originalContent = element.innerHTML; + + // Add event listeners for editing + function onBlur() { + finishEditing(element); + } + + function onKeyDown(event) { + if (event.key === "Escape") { + // Cancel editing + element.innerHTML = element._originalContent; + finishEditing(element); + event.preventDefault(); + } else if (event.key === "Enter" && !event.shiftKey) { + // Finish editing on Enter (unless Shift is held) + finishEditing(element); + event.preventDefault(); + } + } + + element.addEventListener("blur", onBlur); + element.addEventListener("keydown", onKeyDown); + + // Store the event listeners for later removal + element._editListeners = { + blur: onBlur, + keydown: onKeyDown + }; + } + + // Function to finish editing and apply changes + function finishEditing(element) { + if (!element || !element.hasAttribute("contenteditable")) { + return; + } + + // Remove contenteditable attribute + element.removeAttribute("contenteditable"); + + // Remove event listeners + if (element._editListeners) { + element.removeEventListener("blur", element._editListeners.blur); + element.removeEventListener("keydown", element._editListeners.keydown); + delete element._editListeners; + } + + // Get the new content + const newContent = element.innerHTML; + + // If content has changed, send the edit to the editor + if (newContent !== element._originalContent && element.hasAttribute("data-brackets-id")) { + const tagId = element.getAttribute("data-brackets-id"); + + // Create a text edit operation + // const edit = { + // type: "textReplace", + // parentID: element.parentNode.getAttribute("data-brackets-id"), + // tagID: tagId, + // content: newContent + // }; + // + // todo: send the edited text to phoenix to change in text editor + } + + // Clean up + delete element._originalContent; + } + // init _editHandler = new DOMEditHandler(window.document); @@ -1182,6 +1261,8 @@ function RemoteFunctions(config) { "redrawHighlights" : redrawHighlights, "applyDOMEdits" : applyDOMEdits, "getSimpleDOM" : getSimpleDOM, - "updateConfig" : updateConfig + "updateConfig" : updateConfig, + "startEditing" : startEditing, + "finishEditing" : finishEditing }; } From 98ddfb9bcd8df80627150b2738d3fa42f6b39cab Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 16 Jul 2025 21:34:53 +0530 Subject: [PATCH 005/849] feat: create the DOM manipulation option box when an element is clicked in the live preview --- .../BrowserScripts/RemoteFunctions.js | 116 ++++++++++++++++-- 1 file changed, 109 insertions(+), 7 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 5bfacb94cf..6063d0f8d6 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -30,6 +30,9 @@ */ function RemoteFunctions(config) { + // this is responsible to make the advanced DOM features active or inactive + // TODO: give this var a better name + let isFlagActive = true; var experimental; if (!config) { @@ -212,6 +215,98 @@ function RemoteFunctions(config) { }; + /** + * This is for the advanced DOM options that appears when a DOM element is clicked + * advanced options like: 'select parent', 'duplicate', 'delete' + */ + function NodeMoreOptionsBox(element) { + this.element = element; + this.remove = this.remove.bind(this); + this.create(); + } + + NodeMoreOptionsBox.prototype = { + create: function() { + // Remove existing more options box if any + this.remove(); + + // compute the position on screen (this gives us the left and the top offset) + var offset = _screenOffset(this.element); + // we need to fetch the height & width of the element to place the box at the correct position + var elementSize = this.element.getBoundingClientRect(); + + // for styling the svg's + if (!document.getElementById("node-more-options-style")) { + const style = document.createElement("style"); + style.id = "node-more-options-style"; + style.textContent = ` + .node-options span > svg { + width: 16px; + height: 16px; + display: block; + } + `; + document.head.appendChild(style); + } + + // create the container + this.body = window.document.createElement("div"); + this.body.style.setProperty("z-index", 2147483647); + this.body.style.setProperty("position", "fixed"); + this.body.style.setProperty("left", (offset.left + (elementSize.width - 40)) + "px"); + this.body.style.setProperty("top", (offset.top - 30 < 0 ? offset.top + this.element.offsetHeight + 5 : offset.top - 30) + "px"); + this.body.style.setProperty("font-size", "12px"); + this.body.style.setProperty("font-family", "Arial, sans-serif"); + + // style the box with a blue background. this will appear on the right side of the clicked DOM element + this.body.style.setProperty("background", "#4285F4"); + this.body.style.setProperty("color", "white"); + this.body.style.setProperty("border-radius", "3px"); + this.body.style.setProperty("padding", "5px 8px"); + this.body.style.setProperty("box-shadow", "0 2px 5px rgba(0,0,0,0.2)"); + this.body.style.setProperty("max-width", "82px"); + this.body.style.setProperty("width", "82px"); + this.body.style.setProperty("pointer-events", "none"); + + const ICONS = { + arrowUp: ` + + `, + + copy: ` + + `, + + trash: ` + + ` + }; + + let content = `
+ + ${ICONS.arrowUp} + + + ${ICONS.copy} + + + ${ICONS.trash} + +
`; + + + this.body.innerHTML = content; + window.document.body.appendChild(this.body); + }, + + remove: function() { + if (this.body && this.body.parentNode) { + window.document.body.removeChild(this.body); + this.body = null; + } + } + }; + // Node info box to display DOM node ID and classes on hover function NodeInfoBox(element) { this.element = element; @@ -640,6 +735,7 @@ function RemoteFunctions(config) { var _hoverHighlight; var _clickHighlight; var _nodeInfoBox; + var _nodeMoreOptionsBox; var _setup = false; @@ -710,15 +806,20 @@ function RemoteFunctions(config) { } } + /** + * This function handles the click event on the live preview DOM element + * it is to show the advanced DOM manipulation options in the live preview + * @param {Event} event + */ function onClick(event) { - if (_validEvent(event)) { - event.preventDefault(); - event.stopPropagation(); - if (event.altKey) { - _toggleEditor(event.target); - } else { - _toggleMenu(event.target); + // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' + if(isFlagActive && event.target.hasAttribute('data-brackets-id')) { + console.log("event:", event); + if(_nodeMoreOptionsBox) { + _nodeMoreOptionsBox.remove(); + _nodeMoreOptionsBox = null; } + _nodeMoreOptionsBox = new NodeMoreOptionsBox(event.target); } } @@ -1247,6 +1348,7 @@ function RemoteFunctions(config) { // Add event listeners for hover window.document.addEventListener("mouseover", onElementHover); window.document.addEventListener("mouseout", onElementHoverOut); + window.document.addEventListener("click", onClick); if (experimental) { window.document.addEventListener("keydown", onKeyDown); From 07c32a08d9e31df3f0b3176a696f23c9fb435618 Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 16 Jul 2025 23:25:36 +0530 Subject: [PATCH 006/849] feat: add click handler to the DOM advance option buttons --- .../BrowserScripts/RemoteFunctions.js | 59 +++++++++++++++++-- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 6063d0f8d6..345e48b778 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -215,6 +215,37 @@ function RemoteFunctions(config) { }; + // TODO: need to implement + function _handleSelectParentOptionClick(e) { + console.log("handle select parent option button was clicked"); + } + + // TODO: need to implement + function _handleDuplicateOptionClick(e) { + console.log("handle duplicate option button was clicked"); + } + + // TODO: need to implement + function _handleDeleteOptionClick(e) { + console.log("handle delete option button was clicked"); + } + + + /** + * This function will get triggered when from the multiple advance DOM buttons, one is clicked + * this function just checks which exact button was clicked and call the required function + * @param {Event} e + * @param {String} action - the data-action attribute to differentiate between buttons + */ + function handleOptionClick(e, action) { + if (action === "select-parent") { + _handleSelectParentOptionClick(e); + } else if (action === "duplicate") { + _handleDuplicateOptionClick(e); + } else if (action === "delete") { + _handleDeleteOptionClick(e); + } + } /** * This is for the advanced DOM options that appears when a DOM element is clicked * advanced options like: 'select parent', 'duplicate', 'delete' @@ -266,7 +297,6 @@ function RemoteFunctions(config) { this.body.style.setProperty("box-shadow", "0 2px 5px rgba(0,0,0,0.2)"); this.body.style.setProperty("max-width", "82px"); this.body.style.setProperty("width", "82px"); - this.body.style.setProperty("pointer-events", "none"); const ICONS = { arrowUp: ` @@ -294,9 +324,20 @@ function RemoteFunctions(config) { `; - this.body.innerHTML = content; window.document.body.appendChild(this.body); + + // add the click handler to all the buttons + const spans = this.body.querySelectorAll('.node-options span'); + spans.forEach(span => { + // to differentiate between each button click we can use the data-action attribute + span.addEventListener('click', (event) => { + event.stopPropagation(); + event.preventDefault(); + const action = event.currentTarget.getAttribute('data-action'); + handleOptionClick(event, action); + }); + }); }, remove: function() { @@ -766,9 +807,15 @@ function RemoteFunctions(config) { if (_hoverHighlight) { _hoverHighlight.clear(); - // Skip highlighting for HTML and BODY tags - if (event.target && event.target.nodeType === Node.ELEMENT_NODE && - event.target.tagName !== "HTML" && event.target.tagName !== "BODY") { + // Skip highlighting for HTML and BODY tags and for DOM elements which doesn't have 'data-brackets-id' + // NOTE: Don't remove 'data-brackets-id' check else hover will also target internal live preview elements + if ( + event.target && + event.target.nodeType === Node.ELEMENT_NODE && + event.target.tagName !== "HTML" && + event.target.tagName !== "BODY" && + event.target.hasAttribute("data-brackets-id") + ) { // Store original background color to restore on hover out event.target._originalBackgroundColor = event.target.style.backgroundColor; event.target.style.backgroundColor = "rgba(0, 162, 255, 0.2)"; @@ -814,7 +861,7 @@ function RemoteFunctions(config) { function onClick(event) { // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' if(isFlagActive && event.target.hasAttribute('data-brackets-id')) { - console.log("event:", event); + //console.log("event:", event); if(_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; From d84ae169ce017cbfdc467375eadb67ebb0d75f9b Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 16 Jul 2025 23:59:27 +0530 Subject: [PATCH 007/849] fix: dom more options box background color changing when hovered --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 345e48b778..271e118418 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -837,7 +837,7 @@ function RemoteFunctions(config) { } // Restore original background color - if (event && event.target && event.target.nodeType === Node.ELEMENT_NODE) { + if (event && event.target && event.target.nodeType === Node.ELEMENT_NODE && event.target.hasAttribute("data-brackets-id")) { if (event.target._originalBackgroundColor !== undefined) { event.target.style.backgroundColor = event.target._originalBackgroundColor; delete event.target._originalBackgroundColor; From 24abd1f21e8a77a31f3c3f3e43c7052dfbfae433 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 17 Jul 2025 10:48:47 +0530 Subject: [PATCH 008/849] feat: add border when a element is clicked --- .../BrowserScripts/RemoteFunctions.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 271e118418..53ad51daa5 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -34,6 +34,10 @@ function RemoteFunctions(config) { // TODO: give this var a better name let isFlagActive = true; + // this will store the element that was clicked previously (before the new click) + // we need this so that we can remove click styling from the previous element when a new element is clicked + let previouslyClickedElement = null; + var experimental; if (!config) { experimental = false; @@ -866,7 +870,21 @@ function RemoteFunctions(config) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; } + + // to remove the border styling from the previously clicked element + if(previouslyClickedElement) { + if(previouslyClickedElement._originalBorder !== undefined) { + previouslyClickedElement.style.border = previouslyClickedElement._originalBorder; + delete previouslyClickedElement._originalBorder; + } else { + previouslyClickedElement.style.border = ""; + } + } + _nodeMoreOptionsBox = new NodeMoreOptionsBox(event.target); + event.target._originalBorder = event.target.style.border; + event.target.style.border = "1px solid #4285F4"; + previouslyClickedElement = event.target; // add the current element to the previouslyClickedElement } } From f7cd3f7d51a0b2da3d2518ac8c95b0467c154a4c Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 17 Jul 2025 12:01:41 +0530 Subject: [PATCH 009/849] fix: change border to outline to prevent content shifting --- .../BrowserScripts/RemoteFunctions.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 53ad51daa5..385e59a060 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -871,19 +871,19 @@ function RemoteFunctions(config) { _nodeMoreOptionsBox = null; } - // to remove the border styling from the previously clicked element - if(previouslyClickedElement) { - if(previouslyClickedElement._originalBorder !== undefined) { - previouslyClickedElement.style.border = previouslyClickedElement._originalBorder; - delete previouslyClickedElement._originalBorder; + // to remove the outline styling from the previously clicked element + if (previouslyClickedElement) { + if (previouslyClickedElement._originalOutline !== undefined) { + previouslyClickedElement.style.outline = previouslyClickedElement._originalOutline; + delete previouslyClickedElement._originalOutline; } else { - previouslyClickedElement.style.border = ""; + previouslyClickedElement.style.outline = ""; } } _nodeMoreOptionsBox = new NodeMoreOptionsBox(event.target); - event.target._originalBorder = event.target.style.border; - event.target.style.border = "1px solid #4285F4"; + event.target._originalOutline = event.target.style.outline; + event.target.style.outline = "1px solid #4285F4"; previouslyClickedElement = event.target; // add the current element to the previouslyClickedElement } } From 4451767f8de1b555c55399aa1865401679834f1e Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 17 Jul 2025 15:05:34 +0530 Subject: [PATCH 010/849] fix: more options box positioning when live preview is scrolled --- .../BrowserScripts/RemoteFunctions.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 385e59a060..3648b88f46 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -265,10 +265,7 @@ function RemoteFunctions(config) { // Remove existing more options box if any this.remove(); - // compute the position on screen (this gives us the left and the top offset) - var offset = _screenOffset(this.element); - // we need to fetch the height & width of the element to place the box at the correct position - var elementSize = this.element.getBoundingClientRect(); + let elemBounds = this.element.getBoundingClientRect(); // for styling the svg's if (!document.getElementById("node-more-options-style")) { @@ -288,8 +285,11 @@ function RemoteFunctions(config) { this.body = window.document.createElement("div"); this.body.style.setProperty("z-index", 2147483647); this.body.style.setProperty("position", "fixed"); - this.body.style.setProperty("left", (offset.left + (elementSize.width - 40)) + "px"); - this.body.style.setProperty("top", (offset.top - 30 < 0 ? offset.top + this.element.offsetHeight + 5 : offset.top - 30) + "px"); + this.body.style.setProperty("left", elemBounds.left + (elemBounds.width - 40) + "px"); + this.body.style.setProperty( + "top", + (elemBounds.top - 30 < 0 ? elemBounds.top + elemBounds.offsetHeight + 5 : elemBounds.top - 30) + "px" + ); this.body.style.setProperty("font-size", "12px"); this.body.style.setProperty("font-family", "Arial, sans-serif"); From b6f481a12fa593a9fe1bc786e5ce0312edcb51aa Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 17 Jul 2025 15:17:42 +0530 Subject: [PATCH 011/849] fix: offset height gives invalid px and puts the more options box below the screen --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 3648b88f46..0fd7aed4b6 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -288,7 +288,9 @@ function RemoteFunctions(config) { this.body.style.setProperty("left", elemBounds.left + (elemBounds.width - 40) + "px"); this.body.style.setProperty( "top", - (elemBounds.top - 30 < 0 ? elemBounds.top + elemBounds.offsetHeight + 5 : elemBounds.top - 30) + "px" + // if there's not enough space to show the box above the element, + // we show it below the element + (elemBounds.top - 30 < 0 ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - 30) + "px" ); this.body.style.setProperty("font-size", "12px"); this.body.style.setProperty("font-family", "Arial, sans-serif"); From e10e89d1e3758d85c692dfc28b9f61cf203bdbd4 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 17 Jul 2025 15:37:48 +0530 Subject: [PATCH 012/849] fix: box getting out of viewport horizontally --- .../BrowserScripts/RemoteFunctions.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 0fd7aed4b6..6058bc0995 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -285,7 +285,17 @@ function RemoteFunctions(config) { this.body = window.document.createElement("div"); this.body.style.setProperty("z-index", 2147483647); this.body.style.setProperty("position", "fixed"); - this.body.style.setProperty("left", elemBounds.left + (elemBounds.width - 40) + "px"); + + // the more options box width + const boxWidth = 82 + 16; // 82px width + 8px padding on each side + let leftPos = elemBounds.left + (elemBounds.width - 40); // the potential left position + // make sure that box wouldn't go out of the viewport + const viewportWidth = window.innerWidth || document.documentElement.clientWidth; + if (leftPos + boxWidth > viewportWidth) { + leftPos = viewportWidth - boxWidth; + } + + this.body.style.setProperty("left", leftPos + "px"); this.body.style.setProperty( "top", // if there's not enough space to show the box above the element, @@ -302,7 +312,7 @@ function RemoteFunctions(config) { this.body.style.setProperty("padding", "5px 8px"); this.body.style.setProperty("box-shadow", "0 2px 5px rgba(0,0,0,0.2)"); this.body.style.setProperty("max-width", "82px"); - this.body.style.setProperty("width", "82px"); + this.body.style.setProperty("width", "82px"); // if changing this, also update the boxWidth variable const ICONS = { arrowUp: ` From 22a16a44e9c69932022fef6f43375bef0017b442 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 17 Jul 2025 18:33:09 +0530 Subject: [PATCH 013/849] fix: positioning of the element info box --- .../BrowserScripts/RemoteFunctions.js | 72 +++++++++++-------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 6058bc0995..30e07a53a3 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -376,17 +376,60 @@ function RemoteFunctions(config) { // Remove existing info box if any this.remove(); + // this value decides where we need to show the box in the UI + // we are creating this here, because if the element has IDs and Classes then we need to increase the value + // so that the box doesn't obscure the element + let pushBoxUp = 29; // px value + + // get the ID and classes for that element, as we need to display it in the box + const id = this.element.id; + const classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; + + let content = ""; // this will hold the main content that will be displayed + // add element tag name + content += "
" + this.element.tagName.toLowerCase() + "
"; + + // Add ID if present + if (id) { + content += "
#" + id + "
"; + pushBoxUp += 17; + } + + // Add classes (limit to 3 with dropdown indicator) + if (classes.length > 0) { + content += "
"; + for (var i = 0; i < Math.min(classes.length, 3); i++) { + content += "." + classes[i] + " "; + } + if (classes.length > 3) { + content += "+" + (classes.length - 3) + " more"; + } + content += "
"; + + pushBoxUp += 17; + } + // compute the position on screen var offset = _screenOffset(this.element), x = offset.left, y = offset.top - 30; // Position above the element + let elemBounds = this.element.getBoundingClientRect(); + + console.log("elemBounds: ", elemBounds); + // create the container this.body = window.document.createElement("div"); this.body.style.setProperty("z-index", 2147483647); this.body.style.setProperty("position", "fixed"); this.body.style.setProperty("left", (offset.left) + "px"); - this.body.style.setProperty("top", (offset.top - 30 < 0 ? offset.top + this.element.offsetHeight + 5 : offset.top - 30) + "px"); + this.body.style.setProperty( + "top", + // if there's not enough space to show the box above the element, + // we show it below the element + (elemBounds.top - pushBoxUp < 0 ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - pushBoxUp) + + "px" + ); this.body.style.setProperty("font-size", "12px"); this.body.style.setProperty("font-family", "Arial, sans-serif"); @@ -399,33 +442,6 @@ function RemoteFunctions(config) { this.body.style.setProperty("max-width", "300px"); this.body.style.setProperty("pointer-events", "none"); // Make it non-interactive - // Get element ID and classes - var id = this.element.id; - var classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; - - // Create content for the info box - var content = ""; - - // Add element tag name - content += "
" + this.element.tagName.toLowerCase() + "
"; - - // Add ID if present - if (id) { - content += "
#" + id + "
"; - } - - // Add classes (limit to 3 with dropdown indicator) - if (classes.length > 0) { - content += "
"; - for (var i = 0; i < Math.min(classes.length, 3); i++) { - content += "." + classes[i] + " "; - } - if (classes.length > 3) { - content += "+" + (classes.length - 3) + " more"; - } - content += "
"; - } - this.body.innerHTML = content; window.document.body.appendChild(this.body); }, From 6a661bde19d96f70f5899706e6399de9250d6903 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 17 Jul 2025 18:48:07 +0530 Subject: [PATCH 014/849] fix: horizontal positioning of both the boxes --- .../BrowserScripts/RemoteFunctions.js | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 30e07a53a3..a563fa1f17 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -286,16 +286,9 @@ function RemoteFunctions(config) { this.body.style.setProperty("z-index", 2147483647); this.body.style.setProperty("position", "fixed"); - // the more options box width - const boxWidth = 82 + 16; // 82px width + 8px padding on each side - let leftPos = elemBounds.left + (elemBounds.width - 40); // the potential left position - // make sure that box wouldn't go out of the viewport - const viewportWidth = window.innerWidth || document.documentElement.clientWidth; - if (leftPos + boxWidth > viewportWidth) { - leftPos = viewportWidth - boxWidth; - } + const boxWidth = 82; - this.body.style.setProperty("left", leftPos + "px"); + this.body.style.setProperty("left", (elemBounds.left + (elemBounds.width - boxWidth)) + "px"); this.body.style.setProperty( "top", // if there's not enough space to show the box above the element, @@ -311,8 +304,7 @@ function RemoteFunctions(config) { this.body.style.setProperty("border-radius", "3px"); this.body.style.setProperty("padding", "5px 8px"); this.body.style.setProperty("box-shadow", "0 2px 5px rgba(0,0,0,0.2)"); - this.body.style.setProperty("max-width", "82px"); - this.body.style.setProperty("width", "82px"); // if changing this, also update the boxWidth variable + this.body.style.setProperty("width", boxWidth + "px"); const ICONS = { arrowUp: ` @@ -409,20 +401,13 @@ function RemoteFunctions(config) { pushBoxUp += 17; } - // compute the position on screen - var offset = _screenOffset(this.element), - x = offset.left, - y = offset.top - 30; // Position above the element - let elemBounds = this.element.getBoundingClientRect(); - console.log("elemBounds: ", elemBounds); - // create the container this.body = window.document.createElement("div"); this.body.style.setProperty("z-index", 2147483647); this.body.style.setProperty("position", "fixed"); - this.body.style.setProperty("left", (offset.left) + "px"); + this.body.style.setProperty("left", elemBounds.left + "px"); this.body.style.setProperty( "top", // if there's not enough space to show the box above the element, From 7fe3498ebfe8c1676cca50b3977bd777f29faddf Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 18 Jul 2025 18:32:13 +0530 Subject: [PATCH 015/849] feat: enable deletion of elements in source code from live preview --- .../BrowserScripts/LiveDevProtocolRemote.js | 2 ++ .../BrowserScripts/RemoteFunctions.js | 34 +++++++++++++------ .../protocol/LiveDevProtocol.js | 7 ++-- src/LiveDevelopment/livePreviewEdit.js | 27 +++++++++++++++ 4 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 src/LiveDevelopment/livePreviewEdit.js diff --git a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js index f83477f7ad..74e007de0b 100644 --- a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js +++ b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js @@ -128,6 +128,8 @@ } }; + global._Brackets_MessageBroker = MessageBroker; + /** * Runtime Domain. Implements remote commands for "Runtime.*" */ diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index a563fa1f17..bd4f90a3b8 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -229,25 +229,39 @@ function RemoteFunctions(config) { console.log("handle duplicate option button was clicked"); } - // TODO: need to implement - function _handleDeleteOptionClick(e) { - console.log("handle delete option button was clicked"); + /** + * This function gets called when the delete button is clicked + * it sends a message to the editor using postMessage to delete the element from the source code + * @param {Event} e + * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute + */ + function _handleDeleteOptionClick(e, element) { + const tagId = element.getAttribute("data-brackets-id"); + if (tagId) { + window._Brackets_MessageBroker.send({ + livePreviewEditEnabled: true, + element: element, + event: e, + tagId: tagId, + delete: true + }); + } } - /** * This function will get triggered when from the multiple advance DOM buttons, one is clicked * this function just checks which exact button was clicked and call the required function * @param {Event} e * @param {String} action - the data-action attribute to differentiate between buttons + * @param {DOMElement} element - the selected DOM element */ - function handleOptionClick(e, action) { + function handleOptionClick(e, action, element) { if (action === "select-parent") { - _handleSelectParentOptionClick(e); + _handleSelectParentOptionClick(e, element); } else if (action === "duplicate") { - _handleDuplicateOptionClick(e); + _handleDuplicateOptionClick(e, element); } else if (action === "delete") { - _handleDeleteOptionClick(e); + _handleDeleteOptionClick(e, element); } } /** @@ -288,7 +302,7 @@ function RemoteFunctions(config) { const boxWidth = 82; - this.body.style.setProperty("left", (elemBounds.left + (elemBounds.width - boxWidth)) + "px"); + this.body.style.setProperty("left", (elemBounds.right - boxWidth) + "px"); this.body.style.setProperty( "top", // if there's not enough space to show the box above the element, @@ -343,7 +357,7 @@ function RemoteFunctions(config) { event.stopPropagation(); event.preventDefault(); const action = event.currentTarget.getAttribute('data-action'); - handleOptionClick(event, action); + handleOptionClick(event, action, this.element); }); }); }, diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js index f6b9c39108..57ed132e21 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js +++ b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js @@ -52,7 +52,8 @@ define(function (require, exports, module) { HTMLInstrumentation = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"), StringUtils = require("utils/StringUtils"), FileViewController = require("project/FileViewController"), - MainViewManager = require("view/MainViewManager"); + MainViewManager = require("view/MainViewManager"), + LivePreviewEdit = require("LiveDevelopment/livePreviewEdit"); const LIVE_DEV_REMOTE_SCRIPTS_FILE_NAME = `phoenix_live_preview_scripts_instrumented_${StringUtils.randomString(8)}.js`; const LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME = `pageLoaderWorker_${StringUtils.randomString(8)}.js`; @@ -207,7 +208,9 @@ define(function (require, exports, module) { var msg = JSON.parse(msgStr), event = msg.method || "event", deferred; - if (msg.id) { + if (msg.livePreviewEditEnabled) { + LivePreviewEdit.deleteElementInSourceByTagId(msg); + } else if (msg.id) { deferred = _responseDeferreds[msg.id]; if (deferred) { delete _responseDeferreds[msg.id]; diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js new file mode 100644 index 0000000000..6fe688ab3d --- /dev/null +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -0,0 +1,27 @@ +define(function (require, exports, module) { + const EditorManager = require("editor/EditorManager"); + + function deleteElementInSourceByTagId(tagId) { + const editor = EditorManager.getActiveEditor(); + if (!editor || !tagId) { + return; + } + + // this will give us the text marker object + const mark = editor.getAllMarks().find((m) => m.tagID === Number(tagId)); + if (!mark) { + return; + } + + // this give us the start position to the end position of the code. + // we just need to delete it + const range = mark.find(); + if (!range) { + return; + } + + editor.replaceRange("", range.from, range.to); + } + + exports.deleteElementInSourceByTagId = deleteElementInSourceByTagId; +}); From 8451ee05d27c8eb988b9c57d64404ee0e0a3148a Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 18 Jul 2025 20:16:56 +0530 Subject: [PATCH 016/849] fix: use existing APIs to reference the source code of the element given its tagId --- .../BrowserScripts/RemoteFunctions.js | 6 +-- .../language/HTMLInstrumentation.js | 6 ++- .../protocol/LiveDevProtocol.js | 8 ++-- src/LiveDevelopment/livePreviewEdit.js | 48 +++++++++++++++---- 4 files changed, 50 insertions(+), 18 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index bd4f90a3b8..1f66ee94e1 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -232,16 +232,16 @@ function RemoteFunctions(config) { /** * This function gets called when the delete button is clicked * it sends a message to the editor using postMessage to delete the element from the source code - * @param {Event} e + * @param {Event} event * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute */ - function _handleDeleteOptionClick(e, element) { + function _handleDeleteOptionClick(event, element) { const tagId = element.getAttribute("data-brackets-id"); if (tagId) { window._Brackets_MessageBroker.send({ livePreviewEditEnabled: true, element: element, - event: e, + event: event, tagId: tagId, delete: true }); diff --git a/src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js b/src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js index f467cd6ad0..13934ac7ee 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js +++ b/src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js @@ -851,10 +851,12 @@ define(function (require, exports, module) { return (mark.tagID === tagId); }); if (markFound) { - return markFound.find().from; + return { + from: markFound.find().from, + to: markFound.find().to + }; } return null; - } // private methods diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js index 57ed132e21..67aa80f5d5 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js +++ b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js @@ -166,7 +166,7 @@ define(function (require, exports, module) { } const allOpenFileCount = MainViewManager.getWorkingSetSize(MainViewManager.ALL_PANES); function selectInHTMLEditor(fullHtmlEditor) { - const position = HTMLInstrumentation.getPositionFromTagId(fullHtmlEditor, parseInt(tagId, 10)); + const position = HTMLInstrumentation.getPositionFromTagId(fullHtmlEditor, parseInt(tagId, 10)).from; if(position && fullHtmlEditor) { const masterEditor = fullHtmlEditor.document._masterEditor || fullHtmlEditor; masterEditor.setCursorPos(position.line, position.ch, true); @@ -209,8 +209,10 @@ define(function (require, exports, module) { event = msg.method || "event", deferred; if (msg.livePreviewEditEnabled) { - LivePreviewEdit.deleteElementInSourceByTagId(msg); - } else if (msg.id) { + LivePreviewEdit.handleLivePreviewEditOperation(msg); + } + + if (msg.id) { deferred = _responseDeferreds[msg.id]; if (deferred) { delete _responseDeferreds[msg.id]; diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js index 6fe688ab3d..abadd1d77c 100644 --- a/src/LiveDevelopment/livePreviewEdit.js +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -1,27 +1,55 @@ define(function (require, exports, module) { const EditorManager = require("editor/EditorManager"); + const HTMLInstrumentation = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"); - function deleteElementInSourceByTagId(tagId) { + + /** + * This function is responsible to delete an element from the source code + * @param {Number} tagId - the data-brackets-id of the DOM element + */ + function _deleteElementInSourceByTagId(tagId) { const editor = EditorManager.getActiveEditor(); if (!editor || !tagId) { return; } - // this will give us the text marker object - const mark = editor.getAllMarks().find((m) => m.tagID === Number(tagId)); - if (!mark) { + // this will give us the start pos and end pos of the DOM element in the source code + // can be referenced using range.from and range.to + const range = HTMLInstrumentation.getPositionFromTagId(editor, tagId); + if(!range) { return; } - // this give us the start position to the end position of the code. - // we just need to delete it - const range = mark.find(); - if (!range) { + editor.replaceRange("", range.from, range.to); + } + + /** + * This is the main function that is exported. + * it will be called by LiveDevProtocol when it receives a message from RemoteFunctions.js using MessageBroker + * Refer to: `handleOptionClick` function in the RemoteFunctions.js and `_receive` function in LiveDevProtocol.js + * + * @param {Object} message - this is the object that is passed by RemoteFunctions.js using MessageBroker + * this object will be in the format + * { + livePreviewEditEnabled: true, + element: element, + event: event, + tagId: tagId, + delete: true + } + * here element is the actual DOM element that is clicked, and tagId is the data-brackets-id + * and 'delete: true is just an example, it might be 'duplicate' or 'select-parent' also + */ + function handleLivePreviewEditOperation(message) { + if (!message.element || !message.tagId) { return; } - editor.replaceRange("", range.from, range.to); + // just call the required functions + if (message.delete) { + _deleteElementInSourceByTagId(Number(message.tagId)); + } } - exports.deleteElementInSourceByTagId = deleteElementInSourceByTagId; + exports.handleLivePreviewEditOperation = handleLivePreviewEditOperation; }); From 42c5178526db5fd3b617fdadefa6881d8fa4ae83 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 18 Jul 2025 20:22:06 +0530 Subject: [PATCH 017/849] fix: remove the popup after it is handled --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 1f66ee94e1..95fd656e71 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -358,6 +358,7 @@ function RemoteFunctions(config) { event.preventDefault(); const action = event.currentTarget.getAttribute('data-action'); handleOptionClick(event, action, this.element); + this.remove(); }); }); }, From ff22ce62240987c228fb4b30ec64061a2ecaead1 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 19 Jul 2025 00:19:51 +0530 Subject: [PATCH 018/849] feat: implement live preview duplicate option functionality --- .../BrowserScripts/RemoteFunctions.js | 26 +++++++++--- src/LiveDevelopment/livePreviewEdit.js | 41 ++++++++++++++++++- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 95fd656e71..b6a805528c 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -224,11 +224,6 @@ function RemoteFunctions(config) { console.log("handle select parent option button was clicked"); } - // TODO: need to implement - function _handleDuplicateOptionClick(e) { - console.log("handle duplicate option button was clicked"); - } - /** * This function gets called when the delete button is clicked * it sends a message to the editor using postMessage to delete the element from the source code @@ -242,12 +237,31 @@ function RemoteFunctions(config) { livePreviewEditEnabled: true, element: element, event: event, - tagId: tagId, + tagId: Number(tagId), delete: true }); } } + /** + * For duplicate button. Read '_handleDeleteOptionClick' jsdoc to understand more on how this works + * @param {Event} event + * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute + */ + function _handleDuplicateOptionClick(event, element) { + const tagId = element.getAttribute("data-brackets-id"); + if (tagId) { + window._Brackets_MessageBroker.send({ + livePreviewEditEnabled: true, + element: element, + event: event, + tagId: Number(tagId), + duplicate: true + }); + } + } + + /** * This function will get triggered when from the multiple advance DOM buttons, one is clicked * this function just checks which exact button was clicked and call the required function diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js index abadd1d77c..5503041aad 100644 --- a/src/LiveDevelopment/livePreviewEdit.js +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -2,6 +2,41 @@ define(function (require, exports, module) { const EditorManager = require("editor/EditorManager"); const HTMLInstrumentation = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"); + /** + * This function is responsible to duplicate an element from the source code + * @param {Number} tagId - the data-brackets-id of the DOM element + */ + function _duplicateElementInSourceByTagId(tagId) { + const editor = EditorManager.getActiveEditor(); + if (!editor || !tagId) { + return; + } + + // this will give us the start pos and end pos of the DOM element in the source code + // can be referenced using range.from and range.to + const range = HTMLInstrumentation.getPositionFromTagId(editor, tagId); + if (!range) { + return; + } + + // this is the actual source code for the element that we need to duplicate + const text = editor.getTextBetween(range.from, range.to); + // this is the indentation on the line + const indent = editor.getTextBetween({line: range.from.line, ch: 0}, range.from); + + // this is the position where we need to insert + // we're giving the char as 0 because since we insert a new line using '\n' + // that's why writing any char value will not work, as the line is empty + // and codemirror doesn't allow to insert at a column (ch) greater than the length of the line + // So, the logic is to just append the indent before the text at this insertPos + const insertPos = { + line: range.from.line + (range.to.line - range.from.line + 1), + ch: 0 + }; + + editor.replaceRange('\n', range.to); + editor.replaceRange(indent + text, insertPos); + } /** * This function is responsible to delete an element from the source code @@ -16,7 +51,7 @@ define(function (require, exports, module) { // this will give us the start pos and end pos of the DOM element in the source code // can be referenced using range.from and range.to const range = HTMLInstrumentation.getPositionFromTagId(editor, tagId); - if(!range) { + if (!range) { return; } @@ -47,7 +82,9 @@ define(function (require, exports, module) { // just call the required functions if (message.delete) { - _deleteElementInSourceByTagId(Number(message.tagId)); + _deleteElementInSourceByTagId(message.tagId); + } else if (message.duplicate) { + _duplicateElementInSourceByTagId(message.tagId); } } From a5d982f186deffe847e28e279c895ea939bd00a2 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 19 Jul 2025 21:31:39 +0530 Subject: [PATCH 019/849] feat: implement select-parent option in live preview edit --- .../BrowserScripts/RemoteFunctions.js | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index b6a805528c..2cae9262fb 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -219,11 +219,6 @@ function RemoteFunctions(config) { }; - // TODO: need to implement - function _handleSelectParentOptionClick(e) { - console.log("handle select parent option button was clicked"); - } - /** * This function gets called when the delete button is clicked * it sends a message to the editor using postMessage to delete the element from the source code @@ -244,7 +239,7 @@ function RemoteFunctions(config) { } /** - * For duplicate button. Read '_handleDeleteOptionClick' jsdoc to understand more on how this works + * this is for duplicate button. Read '_handleDeleteOptionClick' jsdoc to understand more on how this works * @param {Event} event * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute */ @@ -261,6 +256,32 @@ function RemoteFunctions(config) { } } + /** + * this is for select-parent button + * When user clicks on this option for a particular element, we get its parent element and trigger a click on it + * @param {Event} event + * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute + */ + function _handleSelectParentOptionClick(event, element) { + if (!element) { + return; + } + + const parentElement = element.parentElement; + if (!parentElement) { + return; + } + + // we need to make sure that the parent element is not the body tag or the html. + // also we expect it to have the 'data-brackets-id' + if ( + parentElement.tagName !== "BODY" && + parentElement.tagName !== "HTML" && + parentElement.hasAttribute("data-brackets-id") + ) { + parentElement.click(); + } + } /** * This function will get triggered when from the multiple advance DOM buttons, one is clicked From 0cc7413f8b32454af93d8e020f5fa29fd63ade69 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 20 Jul 2025 01:05:38 +0530 Subject: [PATCH 020/849] fix: implement shadow DOM to prevent box styles being overridden by user stylesheets --- .../BrowserScripts/RemoteFunctions.js | 142 ++++++++++-------- 1 file changed, 83 insertions(+), 59 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 2cae9262fb..7a689be439 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -310,87 +310,111 @@ function RemoteFunctions(config) { } NodeMoreOptionsBox.prototype = { - create: function() { - // Remove existing more options box if any - this.remove(); - - let elemBounds = this.element.getBoundingClientRect(); - - // for styling the svg's - if (!document.getElementById("node-more-options-style")) { - const style = document.createElement("style"); - style.id = "node-more-options-style"; - style.textContent = ` - .node-options span > svg { - width: 16px; - height: 16px; - display: block; - } - `; - document.head.appendChild(style); - } - - // create the container + _style: function() { this.body = window.document.createElement("div"); - this.body.style.setProperty("z-index", 2147483647); - this.body.style.setProperty("position", "fixed"); - const boxWidth = 82; + // this is shadow DOM. + // we need it because if we add the box directly to the DOM then users style might override it. + // {mode: "closed"} means that users will not be able to access the shadow DOM + const shadow = this.body.attachShadow({ mode: "closed" }); - this.body.style.setProperty("left", (elemBounds.right - boxWidth) + "px"); - this.body.style.setProperty( - "top", - // if there's not enough space to show the box above the element, - // we show it below the element - (elemBounds.top - 30 < 0 ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - 30) + "px" - ); - this.body.style.setProperty("font-size", "12px"); - this.body.style.setProperty("font-family", "Arial, sans-serif"); + // the element that was clicked + let elemBounds = this.element.getBoundingClientRect(); - // style the box with a blue background. this will appear on the right side of the clicked DOM element - this.body.style.setProperty("background", "#4285F4"); - this.body.style.setProperty("color", "white"); - this.body.style.setProperty("border-radius", "3px"); - this.body.style.setProperty("padding", "5px 8px"); - this.body.style.setProperty("box-shadow", "0 2px 5px rgba(0,0,0,0.2)"); - this.body.style.setProperty("width", boxWidth + "px"); + // the box width and the positions where it should be placed + const boxWidth = 82; + const leftPos = (elemBounds.right - boxWidth); + const topPos = (elemBounds.top - 30 < 0 ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - 30); + // the icons that is displayed in the box const ICONS = { - arrowUp: ` - - `, - - copy: ` - - `, - - trash: ` - - ` + arrowUp: ` + + + + `, + + copy: ` + + + + `, + + trash: ` + + + + ` }; - let content = `
- + let content = `
+ ${ICONS.arrowUp} - + ${ICONS.copy} - + ${ICONS.trash}
`; - this.body.innerHTML = content; + const styles = ` + .box { + background-color: #4285F4; + color: white; + border-radius: 3px; + padding: 5px 8px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + font-size: 12px; + font-family: Arial, sans-serif; + z-index: 2147483647; + position: fixed; + left: ${leftPos}px; + top: ${topPos}px; + width: ${boxWidth}px; + box-sizing: border-box; + } + + .node-options { + display: flex; + gap: 8px; + align-items: center; + } + + .node-options span { + cursor: pointer; + display: flex; + align-items: center; + } + + .node-options span > svg { + width: 16px; + height: 16px; + display: block; + } + `; + + // add everything to the shadow box + shadow.innerHTML = `
${content}
`; + this._shadow = shadow; + }, + + create: function() { + this.remove(); // remove existing box if already present + this._style(); // style the box + window.document.body.appendChild(this.body); - // add the click handler to all the buttons - const spans = this.body.querySelectorAll('.node-options span'); + // add click handler to all the buttons + const spans = this._shadow.querySelectorAll('.node-options span'); spans.forEach(span => { - // to differentiate between each button click we can use the data-action attribute span.addEventListener('click', (event) => { event.stopPropagation(); event.preventDefault(); + // data-action is to differentiate between the buttons (duplicate, delete or select-parent) const action = event.currentTarget.getAttribute('data-action'); handleOptionClick(event, action, this.element); this.remove(); From 444d0092a0484099bf7ce6792ed4da251811ec85 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 20 Jul 2025 01:25:30 +0530 Subject: [PATCH 021/849] fix: box now moves along with the selected element when scrolled --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 7a689be439..4860fc4ef9 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -323,8 +323,13 @@ function RemoteFunctions(config) { // the box width and the positions where it should be placed const boxWidth = 82; - const leftPos = (elemBounds.right - boxWidth); - const topPos = (elemBounds.top - 30 < 0 ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - 30); + const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; + const scrollTop = window.pageYOffset || document.documentElement.scrollTop; + + const leftPos = elemBounds.right - boxWidth + scrollLeft; + const topPos = (elemBounds.top - 30 < 0 + ? elemBounds.top + elemBounds.height + 5 + : elemBounds.top - 30) + scrollTop; // the icons that is displayed in the box const ICONS = { @@ -371,7 +376,7 @@ function RemoteFunctions(config) { font-size: 12px; font-family: Arial, sans-serif; z-index: 2147483647; - position: fixed; + position: absolute; left: ${leftPos}px; top: ${topPos}px; width: ${boxWidth}px; From 735627fa7b29640f2996838b688f42d10768185f Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 20 Jul 2025 01:55:59 +0530 Subject: [PATCH 022/849] fix: positioning of the info box --- .../BrowserScripts/RemoteFunctions.js | 105 +++++++++++------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 4860fc4ef9..fc57b70bff 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -443,70 +443,99 @@ function RemoteFunctions(config) { } NodeInfoBox.prototype = { - create: function() { - // Remove existing info box if any - this.remove(); + _style: function() { + this.body = window.document.createElement("div"); + + // this is shadow DOM. + // we need it because if we add the box directly to the DOM then users style might override it. + // {mode: "closed"} means that users will not be able to access the shadow DOM + const shadow = this.body.attachShadow({ mode: "closed" }); + + // the element that was clicked + let elemBounds = this.element.getBoundingClientRect(); + + // the positions where it should be placed + const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; + const scrollTop = window.pageYOffset || document.documentElement.scrollTop; // this value decides where we need to show the box in the UI // we are creating this here, because if the element has IDs and Classes then we need to increase the value // so that the box doesn't obscure the element - let pushBoxUp = 29; // px value + let pushBoxUp = 28; // px value // get the ID and classes for that element, as we need to display it in the box const id = this.element.id; const classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; let content = ""; // this will hold the main content that will be displayed - // add element tag name - content += "
" + this.element.tagName.toLowerCase() + "
"; + content += "
" + this.element.tagName.toLowerCase() + "
"; // add element tag name // Add ID if present if (id) { - content += "
#" + id + "
"; - pushBoxUp += 17; + content += "
#" + id + "
"; + pushBoxUp += 16; } // Add classes (limit to 3 with dropdown indicator) if (classes.length > 0) { - content += "
"; + content += "
"; for (var i = 0; i < Math.min(classes.length, 3); i++) { content += "." + classes[i] + " "; } if (classes.length > 3) { - content += "+" + (classes.length - 3) + " more"; + content += "+" + (classes.length - 3) + " more"; } content += "
"; - - pushBoxUp += 17; + pushBoxUp += 16; } - let elemBounds = this.element.getBoundingClientRect(); + // Now calculate topPos using the final pushBoxUp value + const leftPos = elemBounds.left + scrollLeft; + const topPos = (elemBounds.top - pushBoxUp < 0 + ? elemBounds.top + elemBounds.height + 5 + : elemBounds.top - pushBoxUp) + scrollTop; + + const styles = ` + .box { + background-color: #4285F4; + color: white; + border-radius: 3px; + padding: 5px 8px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + font-size: 12px; + font-family: Arial, sans-serif; + z-index: 2147483647; + position: absolute; + left: ${leftPos}px; + top: ${topPos}px; + max-width: 300px; + box-sizing: border-box; + pointer-events: none; + } + + .tag-name { + font-weight: bold; + } + + .id-name, + .class-name { + margin-top: 3px; + } + + .exceeded-classes { + opacity: 0.8; + } + `; + + // add everything to the shadow box + shadow.innerHTML = `
${content}
`; + this._shadow = shadow; + }, + + create: function() { + this.remove(); // remove existing box if already present + this._style(); // style the box - // create the container - this.body = window.document.createElement("div"); - this.body.style.setProperty("z-index", 2147483647); - this.body.style.setProperty("position", "fixed"); - this.body.style.setProperty("left", elemBounds.left + "px"); - this.body.style.setProperty( - "top", - // if there's not enough space to show the box above the element, - // we show it below the element - (elemBounds.top - pushBoxUp < 0 ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - pushBoxUp) + - "px" - ); - this.body.style.setProperty("font-size", "12px"); - this.body.style.setProperty("font-family", "Arial, sans-serif"); - - // Style the info box with a blue background - this.body.style.setProperty("background", "#4285F4"); - this.body.style.setProperty("color", "white"); - this.body.style.setProperty("border-radius", "3px"); - this.body.style.setProperty("padding", "5px 8px"); - this.body.style.setProperty("box-shadow", "0 2px 5px rgba(0,0,0,0.2)"); - this.body.style.setProperty("max-width", "300px"); - this.body.style.setProperty("pointer-events", "none"); // Make it non-interactive - - this.body.innerHTML = content; window.document.body.appendChild(this.body); }, From c2f8cadf4bf9ff43ca4a71dd0d18036cbbd8d24d Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 20 Jul 2025 14:03:23 +0530 Subject: [PATCH 023/849] fix: remove properties after setting values --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index fc57b70bff..0094b1e1e0 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -965,10 +965,10 @@ function RemoteFunctions(config) { if (event && event.target && event.target.nodeType === Node.ELEMENT_NODE && event.target.hasAttribute("data-brackets-id")) { if (event.target._originalBackgroundColor !== undefined) { event.target.style.backgroundColor = event.target._originalBackgroundColor; - delete event.target._originalBackgroundColor; } else { event.target.style.backgroundColor = ""; } + delete event.target._originalBackgroundColor; } // Remove info box when mouse leaves the element @@ -986,7 +986,6 @@ function RemoteFunctions(config) { function onClick(event) { // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' if(isFlagActive && event.target.hasAttribute('data-brackets-id')) { - //console.log("event:", event); if(_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; @@ -996,10 +995,10 @@ function RemoteFunctions(config) { if (previouslyClickedElement) { if (previouslyClickedElement._originalOutline !== undefined) { previouslyClickedElement.style.outline = previouslyClickedElement._originalOutline; - delete previouslyClickedElement._originalOutline; } else { previouslyClickedElement.style.outline = ""; } + delete previouslyClickedElement._originalOutline; } _nodeMoreOptionsBox = new NodeMoreOptionsBox(event.target); From 25d823c82423cd568609dc5405813cc862a060ad Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 20 Jul 2025 15:46:08 +0530 Subject: [PATCH 024/849] feat: add event listener for dragging inside live preview --- .../BrowserScripts/RemoteFunctions.js | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 0094b1e1e0..13af035291 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -299,6 +299,22 @@ function RemoteFunctions(config) { _handleDeleteOptionClick(e, element); } } + + function _dragStartChores(element) { + element._originalDragOpacity = element.style.opacity; + element.style.opacity = 0.3; + } + + + function _dragEndChores(element) { + if (element._originalDragOpacity) { + element.style.opacity = element._originalDragOpacity; + } else { + element.style.opacity = 1; + } + delete element._originalDragOpacity; + } + /** * This is for the advanced DOM options that appears when a DOM element is clicked * advanced options like: 'select parent', 'duplicate', 'delete' @@ -310,6 +326,36 @@ function RemoteFunctions(config) { } NodeMoreOptionsBox.prototype = { + _registerDragDrop: function() { + this.element.setAttribute("draggable", true); + + this.element.addEventListener("dragstart", (event) => { + event.stopPropagation(); + event.dataTransfer.setData("text/plain", this.element.getAttribute("data-brackets-id")); + _dragStartChores(this.element); + console.log("pluto- dragstart: ", this.element.getAttribute("data-brackets-id")); + }); + + this.element.addEventListener("dragover", (event) => { + event.preventDefault(); + event.stopPropagation(); + console.log("pluto- dragover"); + }); + + this.element.addEventListener("dragend", (event) => { + event.preventDefault(); + event.stopPropagation(); + _dragEndChores(this.element); + console.log("pluto- dragend"); + }); + + this.element.addEventListener("drop", (event) => { + event.preventDefault(); + event.stopPropagation(); + console.log("pluto- drop"); + }); + }, + _style: function() { this.body = window.document.createElement("div"); @@ -425,6 +471,8 @@ function RemoteFunctions(config) { this.remove(); }); }); + + this._registerDragDrop(); }, remove: function() { From 29df4b8476c1439af295c49eb8389bb59a4ba4b0 Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 21 Jul 2025 01:22:47 +0530 Subject: [PATCH 025/849] feat: implement live preview edit text functionality --- .../BrowserScripts/RemoteFunctions.js | 18 +++---- src/LiveDevelopment/livePreviewEdit.js | 49 +++++++++++++++++-- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 13af035291..ff97e3c29b 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1553,16 +1553,14 @@ function RemoteFunctions(config) { // If content has changed, send the edit to the editor if (newContent !== element._originalContent && element.hasAttribute("data-brackets-id")) { const tagId = element.getAttribute("data-brackets-id"); - - // Create a text edit operation - // const edit = { - // type: "textReplace", - // parentID: element.parentNode.getAttribute("data-brackets-id"), - // tagID: tagId, - // content: newContent - // }; - // - // todo: send the edited text to phoenix to change in text editor + window._Brackets_MessageBroker.send({ + livePreviewEditEnabled: true, + element: element, + oldContent: element._originalContent, + newContent: newContent, + tagId: Number(tagId), + livePreviewTextEdit: true + }); } // Clean up diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js index 5503041aad..b6952c79eb 100644 --- a/src/LiveDevelopment/livePreviewEdit.js +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -2,6 +2,46 @@ define(function (require, exports, module) { const EditorManager = require("editor/EditorManager"); const HTMLInstrumentation = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"); + /** + * this function handles the text edit in the source code when user updates the text in the live preview + * @param {Object} message - the message object + * { + * livePreviewEditEnabled: true, + element: the DOM element that was modified, + oldContent: the text that was present before the edit, + newContent: the new text, + tagId: data-brackets-id of the DOM element, + livePreviewTextEdit: true + } + * + * The logic is: get the text in the editor using the tagId. split that text using the old content + * join the text back and add the new content in between + */ + function _editTextInSource(message) { + const editor = EditorManager.getActiveEditor(); + if (!editor || !message.tagId) { + return; + } + + // this will give us the start pos and end pos of the DOM element in the source code + // can be referenced using range.from and range.to + const range = HTMLInstrumentation.getPositionFromTagId(editor, message.tagId); + if (!range) { + return; + } + + // this is the actual source code for the element that we need to duplicate + const text = editor.getTextBetween(range.from, range.to); + // split the text as we want to remove the old content from the source code + // for ex: if we have

hello

then splitting from hello will give us [

,

] + const splittedText = text.split(message.oldContent); + + // so now we just merge the whole thing back replacing the old content with the new one + const finalText = splittedText[0] + message.newContent + splittedText[1]; + + editor.replaceRange(finalText, range.from, range.to); + } + /** * This function is responsible to duplicate an element from the source code * @param {Number} tagId - the data-brackets-id of the DOM element @@ -67,13 +107,10 @@ define(function (require, exports, module) { * this object will be in the format * { livePreviewEditEnabled: true, - element: element, - event: event, tagId: tagId, - delete: true + delete || duplicate || livePreviewTextEdit: true } - * here element is the actual DOM element that is clicked, and tagId is the data-brackets-id - * and 'delete: true is just an example, it might be 'duplicate' or 'select-parent' also + * these are the main properties that are passed through the message */ function handleLivePreviewEditOperation(message) { if (!message.element || !message.tagId) { @@ -85,6 +122,8 @@ define(function (require, exports, module) { _deleteElementInSourceByTagId(message.tagId); } else if (message.duplicate) { _duplicateElementInSourceByTagId(message.tagId); + } else if (message.livePreviewTextEdit) { + _editTextInSource(message); } } From db02790cf3f93652de4c7e0c947f986ae88e11e3 Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 21 Jul 2025 12:42:08 +0530 Subject: [PATCH 026/849] fix: duplication issue when there is some content before the element --- src/LiveDevelopment/livePreviewEdit.js | 34 +++++++++++++++----------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js index b6952c79eb..277589a861 100644 --- a/src/LiveDevelopment/livePreviewEdit.js +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -62,20 +62,26 @@ define(function (require, exports, module) { // this is the actual source code for the element that we need to duplicate const text = editor.getTextBetween(range.from, range.to); // this is the indentation on the line - const indent = editor.getTextBetween({line: range.from.line, ch: 0}, range.from); - - // this is the position where we need to insert - // we're giving the char as 0 because since we insert a new line using '\n' - // that's why writing any char value will not work, as the line is empty - // and codemirror doesn't allow to insert at a column (ch) greater than the length of the line - // So, the logic is to just append the indent before the text at this insertPos - const insertPos = { - line: range.from.line + (range.to.line - range.from.line + 1), - ch: 0 - }; - - editor.replaceRange('\n', range.to); - editor.replaceRange(indent + text, insertPos); + const indent = editor.getTextBetween({ line: range.from.line, ch: 0 }, range.from); + + // make sure there is only indentation and no text before it + if (indent.trim() === "") { + // this is the position where we need to insert + // we're giving the char as 0 because since we insert a new line using '\n' + // that's why writing any char value will not work, as the line is empty + // and codemirror doesn't allow to insert at a column (ch) greater than the length of the line + // So, the logic is to just append the indent before the text at this insertPos + const insertPos = { + line: range.from.line + (range.to.line - range.from.line + 1), + ch: 0 + }; + + editor.replaceRange("\n", range.to); + editor.replaceRange(indent + text, insertPos); + } else { + // if there is some text, we just add the duplicated text right next to it + editor.replaceRange(text, range.from); + } } /** From 1794526da5174c3e8a961a8b82af0a83acf4e0c5 Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 21 Jul 2025 13:23:49 +0530 Subject: [PATCH 027/849] fix: disbale live preview edit for html & body tags --- .../BrowserScripts/RemoteFunctions.js | 21 +++++++++++++++---- .../protocol/LiveDevProtocol.js | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index ff97e3c29b..9ba394b139 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -227,7 +227,8 @@ function RemoteFunctions(config) { */ function _handleDeleteOptionClick(event, element) { const tagId = element.getAttribute("data-brackets-id"); - if (tagId) { + + if (tagId && element.tagName !== "BODY" && element.tagName !== "HTML") { window._Brackets_MessageBroker.send({ livePreviewEditEnabled: true, element: element, @@ -235,6 +236,8 @@ function RemoteFunctions(config) { tagId: Number(tagId), delete: true }); + } else { + console.error("The TagID might be unavailable or the element tag is directly body or html"); } } @@ -245,7 +248,8 @@ function RemoteFunctions(config) { */ function _handleDuplicateOptionClick(event, element) { const tagId = element.getAttribute("data-brackets-id"); - if (tagId) { + + if (tagId && element.tagName !== "BODY" && element.tagName !== "HTML") { window._Brackets_MessageBroker.send({ livePreviewEditEnabled: true, element: element, @@ -253,6 +257,8 @@ function RemoteFunctions(config) { tagId: Number(tagId), duplicate: true }); + } else { + console.error("The TagID might be unavailable or the element tag is directly body or html"); } } @@ -280,6 +286,8 @@ function RemoteFunctions(config) { parentElement.hasAttribute("data-brackets-id") ) { parentElement.click(); + } else { + console.error("The TagID might be unavailable or the parent element tag is directly body or html"); } } @@ -1033,8 +1041,13 @@ function RemoteFunctions(config) { */ function onClick(event) { // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' - if(isFlagActive && event.target.hasAttribute('data-brackets-id')) { - if(_nodeMoreOptionsBox) { + if ( + isFlagActive && + event.target.hasAttribute("data-brackets-id") && + event.target.tagName !== "BODY" && + event.target.tagName !== "HTML" + ) { + if (_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; } diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js index 67aa80f5d5..b3206978ca 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js +++ b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js @@ -53,7 +53,7 @@ define(function (require, exports, module) { StringUtils = require("utils/StringUtils"), FileViewController = require("project/FileViewController"), MainViewManager = require("view/MainViewManager"), - LivePreviewEdit = require("LiveDevelopment/livePreviewEdit"); + LivePreviewEdit = require("LiveDevelopment/LivePreviewEdit"); const LIVE_DEV_REMOTE_SCRIPTS_FILE_NAME = `phoenix_live_preview_scripts_instrumented_${StringUtils.randomString(8)}.js`; const LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME = `pageLoaderWorker_${StringUtils.randomString(8)}.js`; From d4b0e201aa1fdb36ca77ab4ef1af9ed2b061074c Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 21 Jul 2025 15:30:00 +0530 Subject: [PATCH 028/849] fix: show more options box at the correct position when live preview panel is resized --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 9ba394b139..3957a8ffe2 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1164,6 +1164,11 @@ function RemoteFunctions(config) { if (_hoverHighlight) { _hoverHighlight.redraw(); } + if (_nodeMoreOptionsBox) { + const element = _nodeMoreOptionsBox.element; + _nodeMoreOptionsBox.remove(); + _nodeMoreOptionsBox = new NodeMoreOptionsBox(element); + } } window.addEventListener("resize", redrawHighlights); From 216c83d3f7aa9f2b8f460dadff8b5b51ab5a7d0e Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 21 Jul 2025 23:52:21 +0530 Subject: [PATCH 029/849] fix: bold italic type of tags break inside live preview and leaks internal attributes --- .../BrowserScripts/RemoteFunctions.js | 54 ++++++++++++++++++- src/LiveDevelopment/livePreviewEdit.js | 17 ++++-- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 3957a8ffe2..b7d1212184 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1520,6 +1520,7 @@ function RemoteFunctions(config) { // Save the original content for potential cancellation element._originalContent = element.innerHTML; + element._originalTextContent = element.textContent; // Add event listeners for editing function onBlur() { @@ -1549,6 +1550,53 @@ function RemoteFunctions(config) { }; } + // this function is to remove the properties from elements before getting the innerHTML + // then add all the properties back to the elements + function cleanupElementProperties(element) { + // a temporary container to hold a clean copy + const tempContainer = document.createElement('div'); + tempContainer.innerHTML = element.innerHTML; + + // get all elements in the temporary container + const allElements = tempContainer.querySelectorAll('*'); + + // Store original attributes for later restoration + const originalAttributes = new Map(); + const elementsInOriginal = element.querySelectorAll('*'); + + // Save original attributes + elementsInOriginal.forEach((el, index) => { + const attrs = {}; + for (let i = 0; i < el.attributes.length; i++) { + const attr = el.attributes[i]; + attrs[attr.name] = attr.value; + } + originalAttributes.set(index, attrs); + }); + + // Remove all attributes from elements in the temp container + allElements.forEach(el => { + while (el.attributes.length > 0) { + el.removeAttribute(el.attributes[0].name); + } + }); + + // Get the clean HTML content + const cleanContent = tempContainer.innerHTML; + + // Restore original attributes to the actual elements + elementsInOriginal.forEach((el, index) => { + if (originalAttributes.has(index)) { + const attrs = originalAttributes.get(index); + for (const [name, value] of Object.entries(attrs)) { + el.setAttribute(name, value); + } + } + }); + + return cleanContent; + } + // Function to finish editing and apply changes function finishEditing(element) { if (!element || !element.hasAttribute("contenteditable")) { @@ -1565,8 +1613,8 @@ function RemoteFunctions(config) { delete element._editListeners; } - // Get the new content - const newContent = element.innerHTML; + // Get the new content after cleaning up unwanted properties + const newContent = cleanupElementProperties(element); // If content has changed, send the edit to the editor if (newContent !== element._originalContent && element.hasAttribute("data-brackets-id")) { @@ -1575,6 +1623,7 @@ function RemoteFunctions(config) { livePreviewEditEnabled: true, element: element, oldContent: element._originalContent, + oldTextContent: element._originalTextContent, newContent: newContent, tagId: Number(tagId), livePreviewTextEdit: true @@ -1583,6 +1632,7 @@ function RemoteFunctions(config) { // Clean up delete element._originalContent; + delete element._originalTextContent; } // init diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js index 277589a861..8929fbc97f 100644 --- a/src/LiveDevelopment/livePreviewEdit.js +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -32,14 +32,21 @@ define(function (require, exports, module) { // this is the actual source code for the element that we need to duplicate const text = editor.getTextBetween(range.from, range.to); + // remove the , and tags from the text, + // this is done because we split the text using the textContent and not the innerHTML + // and textContent doesn't have all these tags + const cleanedText = text.replace(/<\/?(b|i|u)>/gi, ""); + // split the text as we want to remove the old content from the source code // for ex: if we have

hello

then splitting from hello will give us [

,

] - const splittedText = text.split(message.oldContent); - - // so now we just merge the whole thing back replacing the old content with the new one - const finalText = splittedText[0] + message.newContent + splittedText[1]; + const splittedText = cleanedText.split(message.oldTextContent); - editor.replaceRange(finalText, range.from, range.to); + // make sure that the split was successful + if (splittedText.length === 2) { + // so now we just merge the whole thing back replacing the old text content with the new one + const finalText = splittedText[0] + message.newContent + splittedText[1]; + editor.replaceRange(finalText, range.from, range.to); + } } /** From d37c0d37ac7e88fa00a72bc29ac479b712fa2f09 Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 22 Jul 2025 00:18:22 +0530 Subject: [PATCH 030/849] fix: use current live doc instead of active editor --- src/LiveDevelopment/livePreviewEdit.js | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js index 8929fbc97f..e097d68864 100644 --- a/src/LiveDevelopment/livePreviewEdit.js +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -1,6 +1,6 @@ define(function (require, exports, module) { - const EditorManager = require("editor/EditorManager"); const HTMLInstrumentation = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"); + const LiveDevMultiBrowser = require("LiveDevelopment/LiveDevMultiBrowser"); /** * this function handles the text edit in the source code when user updates the text in the live preview @@ -18,7 +18,13 @@ define(function (require, exports, module) { * join the text back and add the new content in between */ function _editTextInSource(message) { - const editor = EditorManager.getActiveEditor(); + // this is to get the currently live document that is being served in the live preview + const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); + if(!currLiveDoc) { + return; + } + + const editor = currLiveDoc.editor; if (!editor || !message.tagId) { return; } @@ -54,7 +60,13 @@ define(function (require, exports, module) { * @param {Number} tagId - the data-brackets-id of the DOM element */ function _duplicateElementInSourceByTagId(tagId) { - const editor = EditorManager.getActiveEditor(); + // this is to get the currently live document that is being served in the live preview + const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); + if(!currLiveDoc) { + return; + } + + const editor = currLiveDoc.editor; if (!editor || !tagId) { return; } @@ -96,7 +108,13 @@ define(function (require, exports, module) { * @param {Number} tagId - the data-brackets-id of the DOM element */ function _deleteElementInSourceByTagId(tagId) { - const editor = EditorManager.getActiveEditor(); + // this is to get the currently live document that is being served in the live preview + const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); + if(!currLiveDoc) { + return; + } + + const editor = currLiveDoc.editor; if (!editor || !tagId) { return; } From 186c5ae28eb457e634bf983062d56b3523f03ab6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 22 Jul 2025 13:57:42 +0530 Subject: [PATCH 031/849] fix: editing text inside live preview leaks phoenix internal attributes --- .../BrowserScripts/LiveDevProtocolRemote.js | 2 +- .../BrowserScripts/RemoteFunctions.js | 55 +++++-------------- src/LiveDevelopment/livePreviewEdit.js | 53 +++++++++++------- 3 files changed, 47 insertions(+), 63 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js index 74e007de0b..551ae1ac04 100644 --- a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js +++ b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js @@ -395,7 +395,7 @@ var element = event.target; if (element && element.hasAttribute('data-brackets-id')) { // Check if it's a double-click for direct editing - if (event.detail === 2 && element.textContent && !['INPUT', 'TEXTAREA', 'SELECT'].includes(element.tagName)) { + if (event.detail === 2 && !['INPUT', 'TEXTAREA', 'SELECT'].includes(element.tagName)) { // Double-click detected, enable direct editing // Make the element editable if (window._LD && window._LD.DOMEditHandler) { diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index b7d1212184..2ec2f6903d 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1518,9 +1518,7 @@ function RemoteFunctions(config) { element.setAttribute("contenteditable", "true"); element.focus(); - // Save the original content for potential cancellation element._originalContent = element.innerHTML; - element._originalTextContent = element.textContent; // Add event listeners for editing function onBlur() { @@ -1550,51 +1548,29 @@ function RemoteFunctions(config) { }; } - // this function is to remove the properties from elements before getting the innerHTML + // this function is to remove the internal properties from elements before getting the innerHTML // then add all the properties back to the elements + // internal properties such as 'data-brackets-id', 'data-ld-highlight' etc function cleanupElementProperties(element) { - // a temporary container to hold a clean copy - const tempContainer = document.createElement('div'); - tempContainer.innerHTML = element.innerHTML; - - // get all elements in the temporary container - const allElements = tempContainer.querySelectorAll('*'); - - // Store original attributes for later restoration - const originalAttributes = new Map(); - const elementsInOriginal = element.querySelectorAll('*'); - - // Save original attributes - elementsInOriginal.forEach((el, index) => { - const attrs = {}; - for (let i = 0; i < el.attributes.length; i++) { - const attr = el.attributes[i]; - attrs[attr.name] = attr.value; - } - originalAttributes.set(index, attrs); - }); + const clone = element.cloneNode(true); + const allElements = [clone, ...clone.querySelectorAll('*')]; - // Remove all attributes from elements in the temp container allElements.forEach(el => { - while (el.attributes.length > 0) { - el.removeAttribute(el.attributes[0].name); + // Remove Phoenix internal attributes + if (el.hasAttribute('data-brackets-id')) { + el.removeAttribute('data-brackets-id'); + } + if (el.hasAttribute('data-ld-highlight')) { + el.removeAttribute('data-ld-highlight'); } - }); - - // Get the clean HTML content - const cleanContent = tempContainer.innerHTML; - // Restore original attributes to the actual elements - elementsInOriginal.forEach((el, index) => { - if (originalAttributes.has(index)) { - const attrs = originalAttributes.get(index); - for (const [name, value] of Object.entries(attrs)) { - el.setAttribute(name, value); - } + // Remove empty style attribute + if (el.hasAttribute('style') && el.getAttribute('style').trim() === '') { + el.removeAttribute('style'); } }); - return cleanContent; + return clone.innerHTML; } // Function to finish editing and apply changes @@ -1622,8 +1598,6 @@ function RemoteFunctions(config) { window._Brackets_MessageBroker.send({ livePreviewEditEnabled: true, element: element, - oldContent: element._originalContent, - oldTextContent: element._originalTextContent, newContent: newContent, tagId: Number(tagId), livePreviewTextEdit: true @@ -1632,7 +1606,6 @@ function RemoteFunctions(config) { // Clean up delete element._originalContent; - delete element._originalTextContent; } // init diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/livePreviewEdit.js index e097d68864..4594117ba8 100644 --- a/src/LiveDevelopment/livePreviewEdit.js +++ b/src/LiveDevelopment/livePreviewEdit.js @@ -2,6 +2,25 @@ define(function (require, exports, module) { const HTMLInstrumentation = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"); const LiveDevMultiBrowser = require("LiveDevelopment/LiveDevMultiBrowser"); + /** + * this is a helper function to find the content boundaries in HTML + * @param {string} html - The HTML string to parse + * @return {Object} - Object with openTag and closeTag properties + */ + function _findContentBoundaries(html) { + const openTagEnd = html.indexOf('>') + 1; + const closeTagStart = html.lastIndexOf('<'); + + if (openTagEnd > 0 && closeTagStart > openTagEnd) { + return { + openTag: html.substring(0, openTagEnd), + closeTag: html.substring(closeTagStart) + }; + } + + return null; + } + /** * this function handles the text edit in the source code when user updates the text in the live preview * @param {Object} message - the message object @@ -18,40 +37,32 @@ define(function (require, exports, module) { * join the text back and add the new content in between */ function _editTextInSource(message) { - // this is to get the currently live document that is being served in the live preview const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); - if(!currLiveDoc) { + if(!currLiveDoc || !currLiveDoc.editor || !message.tagId) { return; } const editor = currLiveDoc.editor; - if (!editor || !message.tagId) { - return; - } - - // this will give us the start pos and end pos of the DOM element in the source code - // can be referenced using range.from and range.to const range = HTMLInstrumentation.getPositionFromTagId(editor, message.tagId); if (!range) { return; } - // this is the actual source code for the element that we need to duplicate const text = editor.getTextBetween(range.from, range.to); - // remove the , and tags from the text, - // this is done because we split the text using the textContent and not the innerHTML - // and textContent doesn't have all these tags - const cleanedText = text.replace(/<\/?(b|i|u)>/gi, ""); - - // split the text as we want to remove the old content from the source code - // for ex: if we have

hello

then splitting from hello will give us [

,

] - const splittedText = cleanedText.split(message.oldTextContent); - - // make sure that the split was successful - if (splittedText.length === 2) { - // so now we just merge the whole thing back replacing the old text content with the new one + let splittedText; + + // we need to find the content boundaries to find exactly where the content starts and where it ends + const boundaries = _findContentBoundaries(text); + if (boundaries) { + splittedText = [boundaries.openTag, boundaries.closeTag]; + } + + // if the text split was done successfully, apply the edit + if (splittedText && splittedText.length === 2) { const finalText = splittedText[0] + message.newContent + splittedText[1]; editor.replaceRange(finalText, range.from, range.to); + } else { + console.error("Live preview text edit operation failed."); } } From baae73607d0926f91ee026f3189d4e8a62015c8a Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 22 Jul 2025 14:03:21 +0530 Subject: [PATCH 032/849] fix: file rename to make it consistent --- src/LiveDevelopment/{livePreviewEdit.js => LivePreviewEditt.js} | 0 .../MultiBrowserImpl/protocol/LiveDevProtocol.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/LiveDevelopment/{livePreviewEdit.js => LivePreviewEditt.js} (100%) diff --git a/src/LiveDevelopment/livePreviewEdit.js b/src/LiveDevelopment/LivePreviewEditt.js similarity index 100% rename from src/LiveDevelopment/livePreviewEdit.js rename to src/LiveDevelopment/LivePreviewEditt.js diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js index b3206978ca..d47fea466f 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js +++ b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js @@ -53,7 +53,7 @@ define(function (require, exports, module) { StringUtils = require("utils/StringUtils"), FileViewController = require("project/FileViewController"), MainViewManager = require("view/MainViewManager"), - LivePreviewEdit = require("LiveDevelopment/LivePreviewEdit"); + LivePreviewEdit = require("LiveDevelopment/LivePreviewEditt"); const LIVE_DEV_REMOTE_SCRIPTS_FILE_NAME = `phoenix_live_preview_scripts_instrumented_${StringUtils.randomString(8)}.js`; const LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME = `pageLoaderWorker_${StringUtils.randomString(8)}.js`; From 1159d1a2be7197736189bfd60793d47f1f5564c7 Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 22 Jul 2025 14:04:08 +0530 Subject: [PATCH 033/849] fix: typo in file name --- src/LiveDevelopment/{LivePreviewEditt.js => LivePreviewEdit.js} | 0 .../MultiBrowserImpl/protocol/LiveDevProtocol.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/LiveDevelopment/{LivePreviewEditt.js => LivePreviewEdit.js} (100%) diff --git a/src/LiveDevelopment/LivePreviewEditt.js b/src/LiveDevelopment/LivePreviewEdit.js similarity index 100% rename from src/LiveDevelopment/LivePreviewEditt.js rename to src/LiveDevelopment/LivePreviewEdit.js diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js index d47fea466f..b3206978ca 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js +++ b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js @@ -53,7 +53,7 @@ define(function (require, exports, module) { StringUtils = require("utils/StringUtils"), FileViewController = require("project/FileViewController"), MainViewManager = require("view/MainViewManager"), - LivePreviewEdit = require("LiveDevelopment/LivePreviewEditt"); + LivePreviewEdit = require("LiveDevelopment/LivePreviewEdit"); const LIVE_DEV_REMOTE_SCRIPTS_FILE_NAME = `phoenix_live_preview_scripts_instrumented_${StringUtils.randomString(8)}.js`; const LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME = `pageLoaderWorker_${StringUtils.randomString(8)}.js`; From ebc68ae20ce12991ade261348a448ab391c4aefd Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 22 Jul 2025 15:35:23 +0530 Subject: [PATCH 034/849] fix: show info box along with more option box when a DOM element is clicked --- .../BrowserScripts/RemoteFunctions.js | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 2ec2f6903d..c98d97ff8f 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1047,6 +1047,7 @@ function RemoteFunctions(config) { event.target.tagName !== "BODY" && event.target.tagName !== "HTML" ) { + event.stopPropagation(); if (_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; @@ -1063,6 +1064,13 @@ function RemoteFunctions(config) { } _nodeMoreOptionsBox = new NodeMoreOptionsBox(event.target); + + // show the info box when a DOM element is clicked + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + } + _nodeInfoBox = new NodeInfoBox(event.target); + event.target._originalOutline = event.target.style.outline; event.target.style.outline = "1px solid #4285F4"; previouslyClickedElement = event.target; // add the current element to the previouslyClickedElement @@ -1122,10 +1130,6 @@ function RemoteFunctions(config) { if (_hoverHighlight) { _hoverHighlight.clear(); } - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - _nodeInfoBox = null; - } } // highlight a node @@ -1168,6 +1172,11 @@ function RemoteFunctions(config) { const element = _nodeMoreOptionsBox.element; _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = new NodeMoreOptionsBox(element); + + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = new NodeInfoBox(element); + } } } @@ -1499,11 +1508,15 @@ function RemoteFunctions(config) { window.document.removeEventListener("mouseover", onElementHover); window.document.removeEventListener("mouseout", onElementHoverOut); - // Remove info box if highlight is disabled + // Remove info box and more options box if highlight is disabled if (_nodeInfoBox) { _nodeInfoBox.remove(); _nodeInfoBox = null; } + if (_nodeMoreOptionsBox) { + _nodeMoreOptionsBox.remove(); + _nodeMoreOptionsBox = null; + } } return JSON.stringify(config); } From 3fb717564a6ea1d9dfce472b9b01114751bf2924 Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 23 Jul 2025 14:26:14 +0530 Subject: [PATCH 035/849] fix: overlapping issue between the info box and the more options box --- .../BrowserScripts/RemoteFunctions.js | 101 +++++++++++++++--- 1 file changed, 89 insertions(+), 12 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index c98d97ff8f..f75a5b3bf0 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -323,6 +323,22 @@ function RemoteFunctions(config) { delete element._originalDragOpacity; } + function checkOverlap(elemWidth, id, classes) { + if(elemWidth > 280) { + return false; + } + if(classes.length >= 3 && elemWidth <= 280) { + return true; + } + if((id || classes.length <= 2) && elemWidth <= 250) { + return true; + } + if(elemWidth <= 180) { + return true; + } + return false; + } + /** * This is for the advanced DOM options that appears when a DOM element is clicked * advanced options like: 'select parent', 'duplicate', 'delete' @@ -380,10 +396,34 @@ function RemoteFunctions(config) { const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; const scrollTop = window.pageYOffset || document.documentElement.scrollTop; - const leftPos = elemBounds.right - boxWidth + scrollLeft; - const topPos = (elemBounds.top - 30 < 0 - ? elemBounds.top + elemBounds.height + 5 - : elemBounds.top - 30) + scrollTop; + // get the ID and classes for the element + // we need this to check for overlap issue between the info box and this box + // because when we have classes and ids then the info box tends to stretch in width + const id = this.element.id; + const classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; + + const isOverlap = checkOverlap(elemBounds.width, id, classes); + + // default position (right aligned with element) + let leftPos = elemBounds.right - boxWidth + scrollLeft; + + // this will be calculated based on whether we have overlap issue or not + let topPos; + + if (isOverlap) { + if (elemBounds.top > 40) { // check if there's enough space at the top + // place at the top + topPos = elemBounds.top - 30 + scrollTop; + } else { + // at the bottom + topPos = elemBounds.top + elemBounds.height + 5 + scrollTop; + } + } else { + // no overlap, so it comes just above the element + topPos = (elemBounds.top - 30 < 0 + ? elemBounds.top + elemBounds.height + 5 + : elemBounds.top - 30) + scrollTop; + } // the icons that is displayed in the box const ICONS = { @@ -492,8 +532,9 @@ function RemoteFunctions(config) { }; // Node info box to display DOM node ID and classes on hover - function NodeInfoBox(element) { + function NodeInfoBox(element, isFromClick) { this.element = element; + this.isFromClick = isFromClick || false; this.remove = this.remove.bind(this); this.create(); } @@ -545,12 +586,45 @@ function RemoteFunctions(config) { pushBoxUp += 16; } - // Now calculate topPos using the final pushBoxUp value - const leftPos = elemBounds.left + scrollLeft; - const topPos = (elemBounds.top - pushBoxUp < 0 + let leftPos = elemBounds.left + scrollLeft; + let topPos = (elemBounds.top - pushBoxUp < 0 ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - pushBoxUp) + scrollTop; + // we need to check for overlap if this is from a click + if (this.isFromClick) { + const isOverlap = checkOverlap(elemBounds.width, id, classes); + + if (isOverlap) { + const windowWidth = window.innerWidth; + const boxWidth = 300; // max-width of the box + + // Estimate the height of the info box based on its content + // base height for tag name + padding + let estimatedHeight = 20; + + // height adjustment if ID is present + if (id) { + estimatedHeight += 15; + } + + // height adjustment if classes are present + if (classes.length > 0) { + estimatedHeight += 15; + } + + // align with the bottom of the info box + topPos = (elemBounds.top + elemBounds.height - estimatedHeight) + scrollTop; + + // decide whether position at left or right + if (elemBounds.left > boxWidth + 10) { + leftPos = elemBounds.left - boxWidth - 10 + scrollLeft; + } else if (windowWidth - elemBounds.right > boxWidth + 10) { + leftPos = elemBounds.right + 10 + scrollLeft; + } + } + } + const styles = ` .box { background-color: #4285F4; @@ -1007,7 +1081,10 @@ function RemoteFunctions(config) { if (_nodeInfoBox) { _nodeInfoBox.remove(); } - _nodeInfoBox = new NodeInfoBox(event.target); + // check if this element is already clicked (has more options box) + // this is needed so that we can check for overlapping issue among the boxes + const isAlreadyClicked = previouslyClickedElement === event.target && _nodeMoreOptionsBox !== null; + _nodeInfoBox = new NodeInfoBox(event.target, isAlreadyClicked); } } } @@ -1069,11 +1146,11 @@ function RemoteFunctions(config) { if (_nodeInfoBox) { _nodeInfoBox.remove(); } - _nodeInfoBox = new NodeInfoBox(event.target); + _nodeInfoBox = new NodeInfoBox(event.target, true); // true means that the element was clicked event.target._originalOutline = event.target.style.outline; event.target.style.outline = "1px solid #4285F4"; - previouslyClickedElement = event.target; // add the current element to the previouslyClickedElement + previouslyClickedElement = event.target; } } @@ -1175,7 +1252,7 @@ function RemoteFunctions(config) { if (_nodeInfoBox) { _nodeInfoBox.remove(); - _nodeInfoBox = new NodeInfoBox(element); + _nodeInfoBox = new NodeInfoBox(element, true); // true means it came from a click } } } From d222ea63dbec713832dccaf88593d08aeadcbff8 Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 23 Jul 2025 15:33:27 +0530 Subject: [PATCH 036/849] fix: calculate info box width based on char count --- .../BrowserScripts/RemoteFunctions.js | 92 +++++++++++++++---- 1 file changed, 76 insertions(+), 16 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index f75a5b3bf0..4b08b9932a 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -323,20 +323,65 @@ function RemoteFunctions(config) { delete element._originalDragOpacity; } - function checkOverlap(elemWidth, id, classes) { - if(elemWidth > 280) { - return false; - } - if(classes.length >= 3 && elemWidth <= 280) { - return true; + /** + * This function is to calculate the width of the info box based on the number of chars in the box + * @param {String} tagName - the element's tag name + * @param {String} id - the element's id + * @param {Array} classes - the array of class names + * @returns {Number} - the total char count + */ + function _calculateInfoBoxCharCount(tagName, id, classes) { + // char count for tag name + let charCount = tagName.length; + + // char count for id + if (id) { + charCount += id.length + 1; // +1 for # } - if((id || classes.length <= 2) && elemWidth <= 250) { - return true; + + // char count for classes + if (classes.length > 0) { + for (let i = 0; i < Math.min(classes.length, 3); i++) { + charCount += classes[i].length + 1; // +1 for . + } + + if (classes.length > 3) { + // "+ X more" for more than 3 classes + const moreText = `+${classes.length - 3} more`; + charCount += moreText.length; + } } - if(elemWidth <= 180) { - return true; + return charCount; + } + + /** + * This function checks whether there is overlap between the info and the more options box + * @param {Number} elemWidth - the width of the DOM element + * @param {String} tagName - the element's tag name + * @param {String} id - the element's id + * @param {Array} classes - the array of class names + * @returns {Number} - the total char count + */ + function checkOverlap(elemWidth, tagName, id, classes) { + const avgCharWidth = 7; + const basePadding = 16; + + // char count for tag name, id, and classes + let charCount = _calculateInfoBoxCharCount(tagName, id, classes); + + // calc estimate width based on the char count + const infoBoxWidth = basePadding + (charCount * avgCharWidth); + + // more options box is 82px + const moreOptionsBoxWidth = 82; + + // check if there's enough space for both boxes + // 20px buffer for spacing between boxes + if (elemWidth > (infoBoxWidth + moreOptionsBoxWidth + 20)) { + return false; // No overlap } - return false; + + return true; } /** @@ -401,8 +446,9 @@ function RemoteFunctions(config) { // because when we have classes and ids then the info box tends to stretch in width const id = this.element.id; const classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; + const tagName = this.element.tagName.toLowerCase(); - const isOverlap = checkOverlap(elemBounds.width, id, classes); + const isOverlap = checkOverlap(elemBounds.width, tagName, id, classes); // default position (right aligned with element) let leftPos = elemBounds.right - boxWidth + scrollLeft; @@ -591,13 +637,25 @@ function RemoteFunctions(config) { ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - pushBoxUp) + scrollTop; + const avgCharWidth = 7; + const basePadding = 16; + + // Get the tag name + const tagName = this.element.tagName.toLowerCase(); + + // Count characters in tag name, id, and classes + let charCount = _calculateInfoBoxCharCount(tagName, id, classes); + + // Calculate estimated width based on character count + // Formula: base padding + (character count * average character width) + const boxWidth = basePadding + (charCount * avgCharWidth); + // we need to check for overlap if this is from a click if (this.isFromClick) { - const isOverlap = checkOverlap(elemBounds.width, id, classes); + const isOverlap = checkOverlap(elemBounds.width, tagName, id, classes); if (isOverlap) { const windowWidth = window.innerWidth; - const boxWidth = 300; // max-width of the box // Estimate the height of the info box based on its content // base height for tag name + padding @@ -616,10 +674,12 @@ function RemoteFunctions(config) { // align with the bottom of the info box topPos = (elemBounds.top + elemBounds.height - estimatedHeight) + scrollTop; - // decide whether position at left or right + // decide whether position at left or right based on available space + // check if there's enough space on the left side if (elemBounds.left > boxWidth + 10) { leftPos = elemBounds.left - boxWidth - 10 + scrollLeft; } else if (windowWidth - elemBounds.right > boxWidth + 10) { + // position on the right leftPos = elemBounds.right + 10 + scrollLeft; } } @@ -638,7 +698,7 @@ function RemoteFunctions(config) { position: absolute; left: ${leftPos}px; top: ${topPos}px; - max-width: 300px; + max-width: ${boxWidth}px; box-sizing: border-box; pointer-events: none; } From fdaa01a9e52e513bf75ae8961c067acb5f3913b7 Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 23 Jul 2025 16:23:01 +0530 Subject: [PATCH 037/849] fix: positioning of the info box --- .../BrowserScripts/RemoteFunctions.js | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 4b08b9932a..1bac39ad52 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -332,26 +332,27 @@ function RemoteFunctions(config) { */ function _calculateInfoBoxCharCount(tagName, id, classes) { // char count for tag name - let charCount = tagName.length; - + let tagNameCharCount = tagName.length; + let idNameCharCount = 0; + let classNameCharCount = 0; // char count for id if (id) { - charCount += id.length + 1; // +1 for # + idNameCharCount = id.length + 1; // +1 for # } // char count for classes if (classes.length > 0) { for (let i = 0; i < Math.min(classes.length, 3); i++) { - charCount += classes[i].length + 1; // +1 for . + classNameCharCount += classes[i].length + 1; // +1 for . } if (classes.length > 3) { // "+ X more" for more than 3 classes const moreText = `+${classes.length - 3} more`; - charCount += moreText.length; + classNameCharCount += moreText.length; } } - return charCount; + return Math.max(tagNameCharCount, idNameCharCount, classNameCharCount); } /** @@ -363,11 +364,14 @@ function RemoteFunctions(config) { * @returns {Number} - the total char count */ function checkOverlap(elemWidth, tagName, id, classes) { - const avgCharWidth = 7; + let avgCharWidth = 6; const basePadding = 16; // char count for tag name, id, and classes let charCount = _calculateInfoBoxCharCount(tagName, id, classes); + if(charCount <= 10) { + avgCharWidth = 7.5; + } // calc estimate width based on the char count const infoBoxWidth = basePadding + (charCount * avgCharWidth); @@ -637,7 +641,7 @@ function RemoteFunctions(config) { ? elemBounds.top + elemBounds.height + 5 : elemBounds.top - pushBoxUp) + scrollTop; - const avgCharWidth = 7; + let avgCharWidth = 6; const basePadding = 16; // Get the tag name @@ -645,6 +649,9 @@ function RemoteFunctions(config) { // Count characters in tag name, id, and classes let charCount = _calculateInfoBoxCharCount(tagName, id, classes); + if(charCount <= 10) { + avgCharWidth = 7.5; + } // Calculate estimated width based on character count // Formula: base padding + (character count * average character width) @@ -698,7 +705,7 @@ function RemoteFunctions(config) { position: absolute; left: ${leftPos}px; top: ${topPos}px; - max-width: ${boxWidth}px; + max-width: fit-content; box-sizing: border-box; pointer-events: none; } From dca465f69afa869659c18c6ff96b4d1056d81b1f Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 23 Jul 2025 16:32:23 +0530 Subject: [PATCH 038/849] fix: info box getting out of bounds --- .../BrowserScripts/RemoteFunctions.js | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 1bac39ad52..00eb633d49 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -442,6 +442,7 @@ function RemoteFunctions(config) { // the box width and the positions where it should be placed const boxWidth = 82; + const boxHeight = 40; // rough estimate for options box const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; const scrollTop = window.pageYOffset || document.documentElement.scrollTop; @@ -456,8 +457,6 @@ function RemoteFunctions(config) { // default position (right aligned with element) let leftPos = elemBounds.right - boxWidth + scrollLeft; - - // this will be calculated based on whether we have overlap issue or not let topPos; if (isOverlap) { @@ -475,6 +474,25 @@ function RemoteFunctions(config) { : elemBounds.top - 30) + scrollTop; } + const windowWidth = window.innerWidth; + const windowHeight = window.innerHeight; + // right edge + if (leftPos + boxWidth > windowWidth) { + leftPos = Math.max(10, windowWidth - boxWidth - 10); + } + // left edge + if (leftPos < 0) { + leftPos = 10; + } + // bottom edge + if (topPos + boxHeight > windowHeight) { + topPos = Math.max(10, windowHeight - boxHeight - 10); + } + // top edge + if (topPos < 0) { + topPos = 10; + } + // the icons that is displayed in the box const ICONS = { arrowUp: ` @@ -656,6 +674,7 @@ function RemoteFunctions(config) { // Calculate estimated width based on character count // Formula: base padding + (character count * average character width) const boxWidth = basePadding + (charCount * avgCharWidth); + const boxHeight = 40 + (id ? 16 : 0) + (classes.length > 0 ? 16 : 0); // rough estimate // we need to check for overlap if this is from a click if (this.isFromClick) { @@ -692,6 +711,25 @@ function RemoteFunctions(config) { } } + const windowWidth = window.innerWidth; + const windowHeight = window.innerHeight; + // right edge + if (leftPos + boxWidth > windowWidth) { + leftPos = Math.max(10, windowWidth - boxWidth - 10); + } + // left edge + if (leftPos < 0) { + leftPos = 10; + } + // bottom edge + if (topPos + boxHeight > windowHeight) { + topPos = Math.max(10, windowHeight - boxHeight - 10); + } + // top edge + if (topPos < 0) { + topPos = 10; + } + const styles = ` .box { background-color: #4285F4; From 80bbb324429032eed0965a6e764ce61bf54a8b43 Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 23 Jul 2025 17:30:54 +0530 Subject: [PATCH 039/849] fix: remove redundant positioning checks --- .../BrowserScripts/RemoteFunctions.js | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 00eb633d49..90c20dbae3 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -474,25 +474,6 @@ function RemoteFunctions(config) { : elemBounds.top - 30) + scrollTop; } - const windowWidth = window.innerWidth; - const windowHeight = window.innerHeight; - // right edge - if (leftPos + boxWidth > windowWidth) { - leftPos = Math.max(10, windowWidth - boxWidth - 10); - } - // left edge - if (leftPos < 0) { - leftPos = 10; - } - // bottom edge - if (topPos + boxHeight > windowHeight) { - topPos = Math.max(10, windowHeight - boxHeight - 10); - } - // top edge - if (topPos < 0) { - topPos = 10; - } - // the icons that is displayed in the box const ICONS = { arrowUp: ` @@ -711,25 +692,6 @@ function RemoteFunctions(config) { } } - const windowWidth = window.innerWidth; - const windowHeight = window.innerHeight; - // right edge - if (leftPos + boxWidth > windowWidth) { - leftPos = Math.max(10, windowWidth - boxWidth - 10); - } - // left edge - if (leftPos < 0) { - leftPos = 10; - } - // bottom edge - if (topPos + boxHeight > windowHeight) { - topPos = Math.max(10, windowHeight - boxHeight - 10); - } - // top edge - if (topPos < 0) { - topPos = 10; - } - const styles = ` .box { background-color: #4285F4; From 2e7ea12536656d2c2352338d62f41d015f8b51ac Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 23 Jul 2025 22:33:27 +0530 Subject: [PATCH 040/849] feat: enable undo in live preview to undo live preview edit operations --- .../BrowserScripts/LiveDevProtocolRemote.js | 9 +++++++++ src/LiveDevelopment/LivePreviewEdit.js | 14 +++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js index 551ae1ac04..54460e7d8e 100644 --- a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js +++ b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js @@ -439,5 +439,14 @@ } } window.document.addEventListener("click", onDocumentClick); + window.document.addEventListener("keydown", function (e) { + // for undo. refer to LivePreviewEdit.js file 'handleLivePreviewEditOperation' function + if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "z") { + MessageBroker.send({ + livePreviewEditEnabled: true, + undoLivePreviewOperation: true + }); + } + }); }(this)); diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 4594117ba8..0c843ec26a 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -142,7 +142,8 @@ define(function (require, exports, module) { /** * This is the main function that is exported. - * it will be called by LiveDevProtocol when it receives a message from RemoteFunctions.js using MessageBroker + * it will be called by LiveDevProtocol when it receives a message from RemoteFunctions.js + * or LiveDevProtocolRemote.js (for undo) using MessageBroker * Refer to: `handleOptionClick` function in the RemoteFunctions.js and `_receive` function in LiveDevProtocol.js * * @param {Object} message - this is the object that is passed by RemoteFunctions.js using MessageBroker @@ -151,11 +152,22 @@ define(function (require, exports, module) { livePreviewEditEnabled: true, tagId: tagId, delete || duplicate || livePreviewTextEdit: true + undoLivePreviewOperation: true (this property is available only for undo operation) } * these are the main properties that are passed through the message */ function handleLivePreviewEditOperation(message) { if (!message.element || !message.tagId) { + // check for undo + if(message.undoLivePreviewOperation) { + const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); + if(!currLiveDoc || !currLiveDoc.editor) { + return; + } + + const editor = currLiveDoc.editor; + editor.undo(); + } return; } From f9df628cceb27b9cc2cce7631a54faf189fa8b3e Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 24 Jul 2025 11:40:36 +0530 Subject: [PATCH 041/849] feat: drag drop live preview implementation --- .../BrowserScripts/RemoteFunctions.js | 171 ++++++++++++++++-- src/LiveDevelopment/LivePreviewEdit.js | 68 ++++++- 2 files changed, 218 insertions(+), 21 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 90c20dbae3..0161be8c09 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -323,6 +323,157 @@ function RemoteFunctions(config) { delete element._originalDragOpacity; } + // CSS class name for drop markers + let DROP_MARKER_CLASSNAME = "__brackets-drop-marker"; + + /** + * This function creates a marker to indicate a valid drop position + * @param {DOMElement} element - The element where the drop is possible + */ + function _createDropMarker(element) { + // clean any existing marker from that element + _removeDropMarkerFromElement(element); + + // create the marker element + let marker = window.document.createElement("div"); + marker.className = DROP_MARKER_CLASSNAME; + + // position the marker at the top of the element + let rect = element.getBoundingClientRect(); + let scrollTop = window.pageYOffset || document.documentElement.scrollTop; + let scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; + + // marker styling + marker.style.position = "absolute"; + marker.style.top = (rect.top + scrollTop - 5) + "px"; + marker.style.left = (rect.left + scrollLeft) + "px"; + marker.style.width = rect.width + "px"; + marker.style.height = "2px"; + marker.style.backgroundColor = "#4285F4"; + marker.style.zIndex = "2147483646"; + + element._dropMarker = marker; // we need this in the _removeDropMarkerFromElement function + window.document.body.appendChild(marker); + } + + /** + * This function removes a drop marker from a specific element + * @param {DOMElement} element - The element to remove the marker from + */ + function _removeDropMarkerFromElement(element) { + if (element._dropMarker && element._dropMarker.parentNode) { + element._dropMarker.parentNode.removeChild(element._dropMarker); + delete element._dropMarker; + } + } + + /** + * this function is to clear all the drop markers from the document + */ + function _clearDropMarkers() { + let markers = window.document.querySelectorAll("." + DROP_MARKER_CLASSNAME); + for (let i = 0; i < markers.length; i++) { + if (markers[i].parentNode) { + markers[i].parentNode.removeChild(markers[i]); + } + } + + // Also clear any element references + let elements = window.document.querySelectorAll("[data-brackets-id]"); + for (let j = 0; j < elements.length; j++) { + delete elements[j]._dropMarker; + } + } + + /** + * Handle dragover events on the document + * Shows drop markers on valid drop targets + * @param {Event} event - The dragover event + */ + function onDragOver(event) { + // we set this on dragStart + if (!window._currentDraggedElement) { + return; + } + + event.preventDefault(); + + // get the element under the cursor + let target = document.elementFromPoint(event.clientX, event.clientY); + if (!target || target === window._currentDraggedElement) { + return; + } + + // get the closest element with a data-brackets-id + while (target && !target.hasAttribute("data-brackets-id")) { + target = target.parentElement; + } + + // skip if no valid target found or if it's the dragged element + if (!target || target === window._currentDraggedElement) { + return; + } + + // Skip BODY and HTML tags + if (target.tagName === "BODY" || target.tagName === "HTML") { + return; + } + + // before creating a drop marker, make sure that we clear all the drop markers + _clearDropMarkers(); + _createDropMarker(target); + } + + /** + * Handle drop events on the document + * Processes the drop of a dragged element onto a valid target + * @param {Event} event - The drop event + */ + function onDrop(event) { + if (!window._currentDraggedElement) { + return; + } + + event.preventDefault(); + event.stopPropagation(); + + // get the element under the cursor + let target = document.elementFromPoint(event.clientX, event.clientY); + + // get the closest element with a data-brackets-id + while (target && !target.hasAttribute("data-brackets-id")) { + target = target.parentElement; + } + + // skip if no valid target found or if it's the dragged element + if (!target || target === window._currentDraggedElement) { + return; + } + + // Skip BODY and HTML tags + if (target.tagName === "BODY" || target.tagName === "HTML") { + return; + } + + // IDs of the source and target elements + const sourceId = window._currentDraggedElement.getAttribute("data-brackets-id"); + const targetId = target.getAttribute("data-brackets-id"); + + // send message to the editor + window._Brackets_MessageBroker.send({ + livePreviewEditEnabled: true, + sourceElement: window._currentDraggedElement, + targetElement: target, + sourceId: Number(sourceId), + targetId: Number(targetId), + move: true + }); + + _clearDropMarkers(); + _dragEndChores(window._currentDraggedElement); + delete window._currentDraggedElement; + } + /** * This function is to calculate the width of the info box based on the number of chars in the box * @param {String} tagName - the element's tag name @@ -406,26 +557,16 @@ function RemoteFunctions(config) { event.stopPropagation(); event.dataTransfer.setData("text/plain", this.element.getAttribute("data-brackets-id")); _dragStartChores(this.element); - console.log("pluto- dragstart: ", this.element.getAttribute("data-brackets-id")); - }); - - this.element.addEventListener("dragover", (event) => { - event.preventDefault(); - event.stopPropagation(); - console.log("pluto- dragover"); + _clearDropMarkers(); + window._currentDraggedElement = this.element; }); this.element.addEventListener("dragend", (event) => { event.preventDefault(); event.stopPropagation(); _dragEndChores(this.element); - console.log("pluto- dragend"); - }); - - this.element.addEventListener("drop", (event) => { - event.preventDefault(); - event.stopPropagation(); - console.log("pluto- drop"); + _clearDropMarkers(); + delete window._currentDraggedElement; }); }, @@ -1778,6 +1919,8 @@ function RemoteFunctions(config) { window.document.addEventListener("mouseover", onElementHover); window.document.addEventListener("mouseout", onElementHoverOut); window.document.addEventListener("click", onClick); + window.document.addEventListener("dragover", onDragOver); + window.document.addEventListener("drop", onDrop); if (experimental) { window.document.addEventListener("keydown", onKeyDown); diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 0c843ec26a..fc6fd78723 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -8,8 +8,8 @@ define(function (require, exports, module) { * @return {Object} - Object with openTag and closeTag properties */ function _findContentBoundaries(html) { - const openTagEnd = html.indexOf('>') + 1; - const closeTagStart = html.lastIndexOf('<'); + const openTagEnd = html.indexOf(">") + 1; + const closeTagStart = html.lastIndexOf("<"); if (openTagEnd > 0 && closeTagStart > openTagEnd) { return { @@ -38,7 +38,7 @@ define(function (require, exports, module) { */ function _editTextInSource(message) { const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); - if(!currLiveDoc || !currLiveDoc.editor || !message.tagId) { + if (!currLiveDoc || !currLiveDoc.editor || !message.tagId) { return; } @@ -73,7 +73,7 @@ define(function (require, exports, module) { function _duplicateElementInSourceByTagId(tagId) { // this is to get the currently live document that is being served in the live preview const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); - if(!currLiveDoc) { + if (!currLiveDoc) { return; } @@ -121,7 +121,7 @@ define(function (require, exports, module) { function _deleteElementInSourceByTagId(tagId) { // this is to get the currently live document that is being served in the live preview const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); - if(!currLiveDoc) { + if (!currLiveDoc) { return; } @@ -140,6 +140,50 @@ define(function (require, exports, module) { editor.replaceRange("", range.from, range.to); } + /** + * This function is responsible for moving an element from one position to another in the source code + * it is called when there is drag-drop in the live preview + * @param {Number} sourceId - the data-brackets-id of the element being moved + * @param {Number} targetId - the data-brackets-id of the target element where to move + */ + function _moveElementInSource(sourceId, targetId) { + // this is to get the currently live document that is being served in the live preview + const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); + if (!currLiveDoc) { + return; + } + + const editor = currLiveDoc.editor; + if (!editor || !sourceId || !targetId) { + return; + } + + // position of source and target elements in the editor + const sourceRange = HTMLInstrumentation.getPositionFromTagId(editor, sourceId); + + if (!sourceRange) { + return; + } + + const sourceText = editor.getTextBetween(sourceRange.from, sourceRange.to); + + // creating a batch operation so that undo in live preview works fine + editor.document.batchOperation(function () { + // first, we need to remove the source code from its initial position + editor.replaceRange("", sourceRange.from, sourceRange.to); + + // get the target range, this is where we want to insert the text + const targetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); + if(!targetRange) { + return; + } + const targetText = editor.getTextBetween(targetRange.from, targetRange.to); + + // sourceText + targetText is done so that new source text can maintain the indentation + editor.replaceRange(sourceText + targetText, targetRange.from, targetRange.to); + }); + } + /** * This is the main function that is exported. * it will be called by LiveDevProtocol when it receives a message from RemoteFunctions.js @@ -153,15 +197,25 @@ define(function (require, exports, module) { tagId: tagId, delete || duplicate || livePreviewTextEdit: true undoLivePreviewOperation: true (this property is available only for undo operation) + + sourceId: sourceId, (these are for move (drag & drop)) + targetId: targetId, + move: true } * these are the main properties that are passed through the message */ function handleLivePreviewEditOperation(message) { + // handle move(drag & drop) + if (message.move && message.sourceId && message.targetId) { + _moveElementInSource(message.sourceId, message.targetId); + return; + } + if (!message.element || !message.tagId) { // check for undo - if(message.undoLivePreviewOperation) { + if (message.undoLivePreviewOperation) { const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); - if(!currLiveDoc || !currLiveDoc.editor) { + if (!currLiveDoc || !currLiveDoc.editor) { return; } From bc07af8cc2bca54240a8ec0606f128b57dc54c3b Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 24 Jul 2025 11:57:03 +0530 Subject: [PATCH 042/849] fix: indent of target element after drag & drop operation --- src/LiveDevelopment/LivePreviewEdit.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index fc6fd78723..771049157c 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -178,9 +178,15 @@ define(function (require, exports, module) { return; } const targetText = editor.getTextBetween(targetRange.from, targetRange.to); - - // sourceText + targetText is done so that new source text can maintain the indentation - editor.replaceRange(sourceText + targetText, targetRange.from, targetRange.to); + const targetIndent = editor.getTextBetween({ line: targetRange.from.line, ch: 0 }, targetRange.from); + + // to check if there is only indentation and no text before it + if (targetIndent.trim() === "") { + const finalText = sourceText + '\n' + targetIndent + targetText; + editor.replaceRange(finalText, targetRange.from, targetRange.to); + } else { + editor.replaceRange(sourceText + targetText, targetRange.from, targetRange.to); + } }); } From 06f2944913dc450bcd73fb4106fe977c3e20fc75 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 24 Jul 2025 12:31:25 +0530 Subject: [PATCH 043/849] feat: allow dropping before as well as after the element --- .../BrowserScripts/RemoteFunctions.js | 26 ++++++++++-- src/LiveDevelopment/LivePreviewEdit.js | 40 +++++++++++++------ 2 files changed, 49 insertions(+), 17 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 0161be8c09..955dd43abd 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -329,8 +329,9 @@ function RemoteFunctions(config) { /** * This function creates a marker to indicate a valid drop position * @param {DOMElement} element - The element where the drop is possible + * @param {Boolean} showAtBottom - Whether to show the marker at the bottom of the element */ - function _createDropMarker(element) { + function _createDropMarker(element, showAtBottom) { // clean any existing marker from that element _removeDropMarkerFromElement(element); @@ -338,20 +339,26 @@ function RemoteFunctions(config) { let marker = window.document.createElement("div"); marker.className = DROP_MARKER_CLASSNAME; - // position the marker at the top of the element + // position the marker at the top or bottom of the element let rect = element.getBoundingClientRect(); let scrollTop = window.pageYOffset || document.documentElement.scrollTop; let scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; // marker styling marker.style.position = "absolute"; - marker.style.top = (rect.top + scrollTop - 5) + "px"; marker.style.left = (rect.left + scrollLeft) + "px"; marker.style.width = rect.width + "px"; marker.style.height = "2px"; marker.style.backgroundColor = "#4285F4"; marker.style.zIndex = "2147483646"; + // position the marker at the top or at the bottom of the element + if (showAtBottom) { + marker.style.top = (rect.bottom + scrollTop + 3) + "px"; + } else { + marker.style.top = (rect.top + scrollTop - 5) + "px"; + } + element._dropMarker = marker; // we need this in the _removeDropMarkerFromElement function window.document.body.appendChild(marker); } @@ -419,9 +426,14 @@ function RemoteFunctions(config) { return; } + // check if the cursor is in the top half or bottom half of the target element + const rect = target.getBoundingClientRect(); + const middleY = rect.top + (rect.height / 2); + const showAtBottom = event.clientY > middleY; + // before creating a drop marker, make sure that we clear all the drop markers _clearDropMarkers(); - _createDropMarker(target); + _createDropMarker(target, showAtBottom); } /** @@ -455,6 +467,11 @@ function RemoteFunctions(config) { return; } + // check if the cursor is in the top half or bottom half of the target element + const rect = target.getBoundingClientRect(); + const middleY = rect.top + (rect.height / 2); + const insertAfter = event.clientY > middleY; + // IDs of the source and target elements const sourceId = window._currentDraggedElement.getAttribute("data-brackets-id"); const targetId = target.getAttribute("data-brackets-id"); @@ -466,6 +483,7 @@ function RemoteFunctions(config) { targetElement: target, sourceId: Number(sourceId), targetId: Number(targetId), + insertAfter: insertAfter, move: true }); diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 771049157c..fdd0a9d586 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -145,8 +145,9 @@ define(function (require, exports, module) { * it is called when there is drag-drop in the live preview * @param {Number} sourceId - the data-brackets-id of the element being moved * @param {Number} targetId - the data-brackets-id of the target element where to move + * @param {Boolean} insertAfter - whether to insert the source element after the target element */ - function _moveElementInSource(sourceId, targetId) { + function _moveElementInSource(sourceId, targetId, insertAfter) { // this is to get the currently live document that is being served in the live preview const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); if (!currLiveDoc) { @@ -160,32 +161,44 @@ define(function (require, exports, module) { // position of source and target elements in the editor const sourceRange = HTMLInstrumentation.getPositionFromTagId(editor, sourceId); + const targetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); - if (!sourceRange) { + if (!sourceRange || !targetRange) { return; } const sourceText = editor.getTextBetween(sourceRange.from, sourceRange.to); + const targetIndent = editor.getTextBetween({ line: targetRange.from.line, ch: 0 }, targetRange.from); // creating a batch operation so that undo in live preview works fine editor.document.batchOperation(function () { // first, we need to remove the source code from its initial position editor.replaceRange("", sourceRange.from, sourceRange.to); - // get the target range, this is where we want to insert the text - const targetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); - if(!targetRange) { + // recalculate the target range, as the source text is not removed + const updatedTargetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); + if (!updatedTargetRange) { return; } - const targetText = editor.getTextBetween(targetRange.from, targetRange.to); - const targetIndent = editor.getTextBetween({ line: targetRange.from.line, ch: 0 }, targetRange.from); - // to check if there is only indentation and no text before it - if (targetIndent.trim() === "") { - const finalText = sourceText + '\n' + targetIndent + targetText; - editor.replaceRange(finalText, targetRange.from, targetRange.to); + if (insertAfter) { + const insertPos = { + line: updatedTargetRange.to.line, + ch: updatedTargetRange.to.ch + }; + + editor.replaceRange("\n" + targetIndent + sourceText, insertPos); } else { - editor.replaceRange(sourceText + targetText, targetRange.from, targetRange.to); + // insert before + const targetText = editor.getTextBetween(updatedTargetRange.from, updatedTargetRange.to); + + // to check if there is only indentation and no text before it + if (targetIndent.trim() === "") { + const finalText = sourceText + '\n' + targetIndent + targetText; + editor.replaceRange(finalText, updatedTargetRange.from, updatedTargetRange.to); + } else { + editor.replaceRange(sourceText + targetText, updatedTargetRange.from, updatedTargetRange.to); + } } }); } @@ -206,6 +219,7 @@ define(function (require, exports, module) { sourceId: sourceId, (these are for move (drag & drop)) targetId: targetId, + insertAfter: boolean, (whether to insert after the target element) move: true } * these are the main properties that are passed through the message @@ -213,7 +227,7 @@ define(function (require, exports, module) { function handleLivePreviewEditOperation(message) { // handle move(drag & drop) if (message.move && message.sourceId && message.targetId) { - _moveElementInSource(message.sourceId, message.targetId); + _moveElementInSource(message.sourceId, message.targetId, message.insertAfter); return; } From e832ac26d05c49da565a22a0335c6aad9eacfb85 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 25 Jul 2025 12:02:42 +0530 Subject: [PATCH 044/849] fix: internal live preview editing styles leak on users source code --- .../BrowserScripts/RemoteFunctions.js | 58 +++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 955dd43abd..caa08a824f 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1773,7 +1773,21 @@ function RemoteFunctions(config) { len = elem.attributes.length; for (i = 0; i < len; i++) { node = elem.attributes.item(i); + + // skip internal attributes that shouldn't be serialized + if (node.name === "draggable" && node.value === "true") { + continue; + } value = (node.name === "data-brackets-id") ? parseInt(node.value, 10) : node.value; + // Clean internal style properties + if (node.name === "style") { + const cleanedStyle = _cleanInternalStyles(value); + + if (cleanedStyle.trim() === '') { + continue; // Skip empty style attribute + } + value = cleanedStyle; + } json.attributes[node.name] = value; } @@ -1834,7 +1848,7 @@ function RemoteFunctions(config) { element.setAttribute("contenteditable", "true"); element.focus(); - element._originalContent = element.innerHTML; + element._originalContent = cleanupElementProperties(element); // Add event listeners for editing function onBlur() { @@ -1864,6 +1878,30 @@ function RemoteFunctions(config) { }; } + // Helper function to clean internal style properties + function _cleanInternalStyles(styleValue) { + if (typeof styleValue !== "string") { + return styleValue; + } + + let cleanedStyle = styleValue; + + // remove internal background color + cleanedStyle = cleanedStyle.replace(/background-color:\s*rgba\(0,\s*162,\s*255,\s*0\.2\)\s*;?\s*/gi, ""); + + // remove internal outline + cleanedStyle = cleanedStyle.replace(/outline:\s*rgb\(66,\s*133,\s*244\)\s+solid\s+1px\s*;?\s*/gi, ""); + cleanedStyle = cleanedStyle.replace(/outline:\s*1px\s+solid\s+#4285F4\s*;?\s*/gi, ""); + + // clean up any extra spaces or semicolons + cleanedStyle = cleanedStyle + .replace(/;\s*;/g, ";") + .replace(/^\s*;\s*/, "") + .replace(/\s*;\s*$/, ""); + + return cleanedStyle; + } + // this function is to remove the internal properties from elements before getting the innerHTML // then add all the properties back to the elements // internal properties such as 'data-brackets-id', 'data-ld-highlight' etc @@ -1880,9 +1918,21 @@ function RemoteFunctions(config) { el.removeAttribute('data-ld-highlight'); } - // Remove empty style attribute - if (el.hasAttribute('style') && el.getAttribute('style').trim() === '') { - el.removeAttribute('style'); + // remove the draggable attribute added internally + if (el.hasAttribute('draggable')) { + el.removeAttribute('draggable'); + } + + // remove internal style properties + if (el.hasAttribute('style')) { + const style = el.getAttribute('style'); + const cleanedStyle = _cleanInternalStyles(style); + + if (cleanedStyle.trim() === '') { + el.removeAttribute('style'); + } else { + el.setAttribute('style', cleanedStyle); + } } }); From d91dc27bc321274bb7974a4ac2d9b5c8fdc81f91 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 25 Jul 2025 12:28:37 +0530 Subject: [PATCH 045/849] fix: remove extra line after drag-drop operation --- src/LiveDevelopment/LivePreviewEdit.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index fdd0a9d586..6ee8631e2b 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -175,6 +175,13 @@ define(function (require, exports, module) { // first, we need to remove the source code from its initial position editor.replaceRange("", sourceRange.from, sourceRange.to); + // since we remove content from the source, we want to clear the extra line + if(sourceRange.from.line !== 0) { + const prevLineText = editor.getLine(sourceRange.from.line - 1); + const chPrevLine = prevLineText ? prevLineText.length : 0; + editor.replaceRange("", {line: sourceRange.from.line - 1, ch: chPrevLine}, sourceRange.from); + } + // recalculate the target range, as the source text is not removed const updatedTargetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); if (!updatedTargetRange) { From 1d7f00601a8da2b20749d435a965cac498da5b74 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 25 Jul 2025 14:22:37 +0530 Subject: [PATCH 046/849] feat: remove boxes when escape key is pressed or user clicks on a empty area --- .../BrowserScripts/RemoteFunctions.js | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index caa08a824f..69a776a0cf 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1377,6 +1377,12 @@ function RemoteFunctions(config) { event.target._originalOutline = event.target.style.outline; event.target.style.outline = "1px solid #4285F4"; previouslyClickedElement = event.target; + } else if ( // when user clicks on the HTML or the BODY tag, we want to remove the boxes + isFlagActive && + _nodeMoreOptionsBox && + (event.target.tagName === "HTML" || event.target.tagName === "BODY") + ) { + dismissMoreOptionsBox(); } } @@ -1394,6 +1400,9 @@ function RemoteFunctions(config) { } function onKeyDown(event) { + if ((event.key === "Escape" || event.key === "Esc")) { + dismissMoreOptionsBox(); + } if (!_setup && _validEvent(event)) { window.document.addEventListener("keyup", onKeyUp); window.document.addEventListener("mouseover", onMouseOver); @@ -1838,6 +1847,32 @@ function RemoteFunctions(config) { return JSON.stringify(config); } + /** + * This function is responsible to remove the more options box + * we do this either when user presses the Esc key or clicks on the HTML or Body tags + */ + function dismissMoreOptionsBox() { + if (_nodeMoreOptionsBox) { + _nodeMoreOptionsBox.remove(); + _nodeMoreOptionsBox = null; + } + + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = null; + } + + if (previouslyClickedElement) { + if (previouslyClickedElement._originalOutline !== undefined) { + previouslyClickedElement.style.outline = previouslyClickedElement._originalOutline; + } else { + previouslyClickedElement.style.outline = ""; + } + delete previouslyClickedElement._originalOutline; + previouslyClickedElement = null; + } + } + // Function to handle direct editing of elements in the live preview function startEditing(element) { if (!element) { @@ -1989,10 +2024,7 @@ function RemoteFunctions(config) { window.document.addEventListener("click", onClick); window.document.addEventListener("dragover", onDragOver); window.document.addEventListener("drop", onDrop); - - if (experimental) { - window.document.addEventListener("keydown", onKeyDown); - } + window.document.addEventListener("keydown", onKeyDown); return { "DOMEditHandler" : DOMEditHandler, From 898ace075d7b7b9b4128c7e1a0a6ca6970ad80c8 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 25 Jul 2025 20:20:00 +0530 Subject: [PATCH 047/849] fix: delete empty lines when deleting an element from the live preview --- src/LiveDevelopment/LivePreviewEdit.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 6ee8631e2b..d6f1ebca79 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -138,6 +138,13 @@ define(function (require, exports, module) { } editor.replaceRange("", range.from, range.to); + + // since we remove content from the source, we want to clear the extra line + if(range.from.line !== 0) { + const prevLineText = editor.getLine(range.from.line - 1); + const chPrevLine = prevLineText ? prevLineText.length : 0; + editor.replaceRange("", {line: range.from.line - 1, ch: chPrevLine}, range.from); + } } /** From e78ec69a7c12bd62bed59102010321d4964d93b7 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 25 Jul 2025 20:40:45 +0530 Subject: [PATCH 048/849] fix: error when trying to remove node info box --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 69a776a0cf..787b66c97d 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -732,7 +732,7 @@ function RemoteFunctions(config) { }, remove: function() { - if (this.body && this.body.parentNode) { + if (this.body && this.body.parentNode && this.body.parentNode === window.document.body) { window.document.body.removeChild(this.body); this.body = null; } @@ -896,7 +896,7 @@ function RemoteFunctions(config) { }, remove: function() { - if (this.body && this.body.parentNode) { + if (this.body && this.body.parentNode && this.body.parentNode === window.document.body) { window.document.body.removeChild(this.body); this.body = null; } From 85d08deb322e1309cc7c60ba7490c68b93d8a76f Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 25 Jul 2025 21:59:54 +0530 Subject: [PATCH 049/849] fix: live preview not handling escape keypress when highlight pref is on --- .../BrowserScripts/RemoteFunctions.js | 20 +++++++++++++++++- src/LiveDevelopment/LiveDevMultiBrowser.js | 21 +++++++++++++++++++ src/LiveDevelopment/main.js | 19 ++++++++++++++++- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 787b66c97d..ed3f157ffa 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1847,19 +1847,32 @@ function RemoteFunctions(config) { return JSON.stringify(config); } + /** + * This function checks if there are any live preview boxes currently visible + * @return {boolean} true if any boxes are visible, false otherwise + */ + function hasVisibleLivePreviewBoxes() { + return _nodeMoreOptionsBox !== null || _nodeInfoBox !== null || previouslyClickedElement !== null; + } + /** * This function is responsible to remove the more options box * we do this either when user presses the Esc key or clicks on the HTML or Body tags + * @return {boolean} true if any boxes were dismissed, false otherwise */ function dismissMoreOptionsBox() { + let dismissed = false; + if (_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; + dismissed = true; } if (_nodeInfoBox) { _nodeInfoBox.remove(); _nodeInfoBox = null; + dismissed = true; } if (previouslyClickedElement) { @@ -1870,7 +1883,10 @@ function RemoteFunctions(config) { } delete previouslyClickedElement._originalOutline; previouslyClickedElement = null; + dismissed = true; } + + return dismissed; } // Function to handle direct editing of elements in the live preview @@ -2037,6 +2053,8 @@ function RemoteFunctions(config) { "getSimpleDOM" : getSimpleDOM, "updateConfig" : updateConfig, "startEditing" : startEditing, - "finishEditing" : finishEditing + "finishEditing" : finishEditing, + "dismissMoreOptionsBox" : dismissMoreOptionsBox, + "hasVisibleLivePreviewBoxes" : hasVisibleLivePreviewBoxes }; } diff --git a/src/LiveDevelopment/LiveDevMultiBrowser.js b/src/LiveDevelopment/LiveDevMultiBrowser.js index baeba8cbe3..0f2d54836f 100644 --- a/src/LiveDevelopment/LiveDevMultiBrowser.js +++ b/src/LiveDevelopment/LiveDevMultiBrowser.js @@ -699,6 +699,25 @@ define(function (require, exports, module) { } } + /** + * Check if live preview boxes are currently visible + */ + function hasVisibleLivePreviewBoxes() { + if (_protocol) { + return _protocol.evaluate("_LD.hasVisibleLivePreviewBoxes()"); + } + return false; + } + + /** + * Dismiss live preview more options box and info box + */ + function dismissLivePreviewBoxes() { + if (_protocol) { + _protocol.evaluate("_LD.dismissMoreOptionsBox()"); + } + } + /** * Originally unload and reload agents. It doesn't apply for this new implementation. * @return {jQuery.Promise} Already resolved promise. @@ -765,6 +784,8 @@ define(function (require, exports, module) { exports.showHighlight = showHighlight; exports.hideHighlight = hideHighlight; exports.redrawHighlight = redrawHighlight; + exports.hasVisibleLivePreviewBoxes = hasVisibleLivePreviewBoxes; + exports.dismissLivePreviewBoxes = dismissLivePreviewBoxes; exports.init = init; exports.isActive = isActive; exports.setLivePreviewPinned= setLivePreviewPinned; diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 6d7cb962c9..5a02c9b755 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -42,7 +42,8 @@ define(function main(require, exports, module) { Strings = require("strings"), ExtensionUtils = require("utils/ExtensionUtils"), StringUtils = require("utils/StringUtils"), - EventDispatcher = require("utils/EventDispatcher"); + EventDispatcher = require("utils/EventDispatcher"), + WorkspaceManager = require("view/WorkspaceManager"); const EVENT_LIVE_HIGHLIGHT_PREF_CHANGED = "liveHighlightPrefChange"; @@ -237,6 +238,19 @@ define(function main(require, exports, module) { } } + /** + * this function handles escape key for live preview to hide boxes if they are visible + * @param {Event} event + */ + function _handleLivePreviewEscapeKey(event) { + // we only handle the escape keypress for live preview when its active + if (MultiBrowserLiveDev.status === MultiBrowserLiveDev.STATUS_ACTIVE) { + MultiBrowserLiveDev.dismissLivePreviewBoxes(); + } + // returning false to let the editor also handle the escape key + return false; + } + /** Initialize LiveDevelopment */ AppInit.appReady(function () { params.parse(); @@ -291,6 +305,9 @@ define(function main(require, exports, module) { exports.trigger(exports.EVENT_LIVE_PREVIEW_RELOAD, clientDetails); }); + // allow live preview to handle escape key event + // Escape is mainly to hide boxes if they are visible + WorkspaceManager.addEscapeKeyEventHandler("livePreview", _handleLivePreviewEscapeKey); }); // init prefs From 6823f6a6aaffe5710cef0f9e548a8aa62b96ca94 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 12:02:29 +0530 Subject: [PATCH 050/849] feat: enable redo when ctrl + y is pressed in live preview --- .../BrowserScripts/LiveDevProtocolRemote.js | 8 +++++ src/LiveDevelopment/LivePreviewEdit.js | 29 ++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js index 54460e7d8e..a959721cd4 100644 --- a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js +++ b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js @@ -447,6 +447,14 @@ undoLivePreviewOperation: true }); } + + // for redo + if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "y") { + MessageBroker.send({ + livePreviewEditEnabled: true, + redoLivePreviewOperation: true + }); + } }); }(this)); diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index d6f1ebca79..3075131809 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -217,6 +217,25 @@ define(function (require, exports, module) { }); } + /** + * This function is to handle the undo redo operation in the live preview + * @param {String} undoOrRedo - "undo" when to undo, and "redo" for redo + */ + function handleUndoRedoOperation(undoOrRedo) { + const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); + if (!currLiveDoc || !currLiveDoc.editor) { + return; + } + + const editor = currLiveDoc.editor; + + if (undoOrRedo === "undo") { + editor.undo(); + } else if (undoOrRedo === "redo") { + editor.redo(); + } + } + /** * This is the main function that is exported. * it will be called by LiveDevProtocol when it receives a message from RemoteFunctions.js @@ -247,14 +266,8 @@ define(function (require, exports, module) { if (!message.element || !message.tagId) { // check for undo - if (message.undoLivePreviewOperation) { - const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); - if (!currLiveDoc || !currLiveDoc.editor) { - return; - } - - const editor = currLiveDoc.editor; - editor.undo(); + if (message.undoLivePreviewOperation || message.redoLivePreviewOperation) { + message.undoLivePreviewOperation ? handleUndoRedoOperation("undo") : handleUndoRedoOperation("redo"); } return; } From 9b470978a09a4f2abc2938a8b46ed2e1e606264e Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 13:22:16 +0530 Subject: [PATCH 051/849] fix: prevent links and buttons to move to another webpage when edit mode is enabled --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index ed3f157ffa..f5f5b9b56e 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1350,6 +1350,7 @@ function RemoteFunctions(config) { event.target.tagName !== "BODY" && event.target.tagName !== "HTML" ) { + event.preventDefault(); event.stopPropagation(); if (_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); From 0eea0512937ec1f583d22606130220c0779e5f8d Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 13:40:56 +0530 Subject: [PATCH 052/849] feat: add pen icon to edit text in the more options box --- .../BrowserScripts/RemoteFunctions.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index f5f5b9b56e..d14de10dac 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -301,6 +301,8 @@ function RemoteFunctions(config) { function handleOptionClick(e, action, element) { if (action === "select-parent") { _handleSelectParentOptionClick(e, element); + } else if (action === "edit-text") { + startEditing(element); } else if (action === "duplicate") { _handleDuplicateOptionClick(e, element); } else if (action === "delete") { @@ -545,8 +547,8 @@ function RemoteFunctions(config) { // calc estimate width based on the char count const infoBoxWidth = basePadding + (charCount * avgCharWidth); - // more options box is 82px - const moreOptionsBoxWidth = 82; + // more options box is 106px + const moreOptionsBoxWidth = 106; // check if there's enough space for both boxes // 20px buffer for spacing between boxes @@ -600,8 +602,7 @@ function RemoteFunctions(config) { let elemBounds = this.element.getBoundingClientRect(); // the box width and the positions where it should be placed - const boxWidth = 82; - const boxHeight = 40; // rough estimate for options box + const boxWidth = 106; const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; const scrollTop = window.pageYOffset || document.documentElement.scrollTop; @@ -641,6 +642,12 @@ function RemoteFunctions(config) { `, + edit: ` + + + + `, + copy: ` ${ICONS.arrowUp} + + ${ICONS.edit} + ${ICONS.copy} From 8662ebc1e5dfe9894af30cc2be15c282a883b629 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 15:36:56 +0530 Subject: [PATCH 053/849] fix: more options box doesn't appear because click event was removed --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index d14de10dac..877fdf127c 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1403,7 +1403,6 @@ function RemoteFunctions(config) { window.document.removeEventListener("mouseover", onMouseOver); window.document.removeEventListener("mouseout", onMouseOut); window.document.removeEventListener("mousemove", onMouseMove); - window.document.removeEventListener("click", onClick); _localHighlight.clear(); _localHighlight = undefined; _setup = false; From 1ecee7198b4f61e6b8996322cabce61918d2af9a Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 15:46:32 +0530 Subject: [PATCH 054/849] fix: do delete and duplicate operation in batch so that undo and redo works as expected --- src/LiveDevelopment/LivePreviewEdit.js | 52 ++++++++++++++------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 3075131809..7a9fc517df 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -94,24 +94,26 @@ define(function (require, exports, module) { // this is the indentation on the line const indent = editor.getTextBetween({ line: range.from.line, ch: 0 }, range.from); - // make sure there is only indentation and no text before it - if (indent.trim() === "") { - // this is the position where we need to insert - // we're giving the char as 0 because since we insert a new line using '\n' - // that's why writing any char value will not work, as the line is empty - // and codemirror doesn't allow to insert at a column (ch) greater than the length of the line - // So, the logic is to just append the indent before the text at this insertPos - const insertPos = { - line: range.from.line + (range.to.line - range.from.line + 1), - ch: 0 - }; + editor.document.batchOperation(function () { + // make sure there is only indentation and no text before it + if (indent.trim() === "") { + // this is the position where we need to insert + // we're giving the char as 0 because since we insert a new line using '\n' + // that's why writing any char value will not work, as the line is empty + // and codemirror doesn't allow to insert at a column (ch) greater than the length of the line + // So, the logic is to just append the indent before the text at this insertPos + const insertPos = { + line: range.from.line + (range.to.line - range.from.line + 1), + ch: 0 + }; - editor.replaceRange("\n", range.to); - editor.replaceRange(indent + text, insertPos); - } else { - // if there is some text, we just add the duplicated text right next to it - editor.replaceRange(text, range.from); - } + editor.replaceRange("\n", range.to); + editor.replaceRange(indent + text, insertPos); + } else { + // if there is some text, we just add the duplicated text right next to it + editor.replaceRange(text, range.from); + } + }); } /** @@ -137,14 +139,16 @@ define(function (require, exports, module) { return; } - editor.replaceRange("", range.from, range.to); + editor.document.batchOperation(function () { + editor.replaceRange("", range.from, range.to); - // since we remove content from the source, we want to clear the extra line - if(range.from.line !== 0) { - const prevLineText = editor.getLine(range.from.line - 1); - const chPrevLine = prevLineText ? prevLineText.length : 0; - editor.replaceRange("", {line: range.from.line - 1, ch: chPrevLine}, range.from); - } + // since we remove content from the source, we want to clear the extra line + if(range.from.line !== 0) { + const prevLineText = editor.getLine(range.from.line - 1); + const chPrevLine = prevLineText ? prevLineText.length : 0; + editor.replaceRange("", {line: range.from.line - 1, ch: chPrevLine}, range.from); + } + }); } /** From f8d2e96623223d6d1ccce1c74a14a1ea84a4b99c Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 19:13:31 +0530 Subject: [PATCH 055/849] feat: hide edit option when element is non-editable --- .../BrowserScripts/RemoteFunctions.js | 70 +++++++++++++++++-- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 877fdf127c..822170f895 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -559,6 +559,59 @@ function RemoteFunctions(config) { return true; } + /** + * this function is to check if an element should show the edit text option + * it is needed because edit text option doesn't make sense with many elements like images, videos, hr tag etc + * @param {Element} element - DOM element to check + * @returns {boolean} - true if we should show the edit text option otherwise false + */ + function _shouldShowEditTextOption(element) { + if (!element || !element.tagName) { + return false; + } + + const tagName = element.tagName.toLowerCase(); + + // these are self-closing tags and don't allow any text content + const voidElements = [ + "img", + "br", + "hr", + "input", + "meta", + "link", + "area", + "base", + "col", + "embed", + "source", + "track", + "wbr" + ]; + + // these elements are non-editable as they have their own mechanisms + const nonEditableElements = [ + "script", + "style", + "noscript", + "canvas", + "svg", + "video", + "audio", + "iframe", + "object", + "button", + "select", + "textarea" + ]; + + if (voidElements.includes(tagName) || nonEditableElements.includes(tagName)) { + return false; + } + + return true; + } + /** * This is for the advanced DOM options that appears when a DOM element is clicked * advanced options like: 'select parent', 'duplicate', 'delete' @@ -601,8 +654,11 @@ function RemoteFunctions(config) { // the element that was clicked let elemBounds = this.element.getBoundingClientRect(); + // check if edit text option should be shown to determine box width + const showEditTextOption = _shouldShowEditTextOption(this.element); + // the box width and the positions where it should be placed - const boxWidth = 106; + const boxWidth = showEditTextOption ? 106 : 82; const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; const scrollTop = window.pageYOffset || document.documentElement.scrollTop; @@ -666,11 +722,15 @@ function RemoteFunctions(config) { let content = `
${ICONS.arrowUp} - - + `; + + if (showEditTextOption) { // to check if the element is editable + content += ` ${ICONS.edit} - - + `; + } + + content += ` ${ICONS.copy} From a0077460c5e6a911d1c14b5edcb747e34a1b7259 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 19:34:00 +0530 Subject: [PATCH 056/849] feat: hide select-parent option when element doesn't supports it --- .../BrowserScripts/RemoteFunctions.js | 60 +++++++++++++++++-- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 822170f895..ae81b622b4 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -612,6 +612,30 @@ function RemoteFunctions(config) { return true; } + /** + * this function is to check if an element should show the 'select-parent' option + * because we don't want to show the select parent option when the parent is directly the body/html tag + * or the parent doesn't have the 'data-brackets-id' + * @param {Element} element - DOM element to check + * @returns {boolean} - true if we should show the select parent option otherwise false + */ + function _shouldShowSelectParentOption(element) { + if (!element || !element.parentElement) { + return false; + } + + const parentElement = element.parentElement; + + if (parentElement.tagName === "HTML" || parentElement.tagName === "BODY") { + return false; + } + if (!parentElement.hasAttribute("data-brackets-id")) { + return false; + } + + return true; + } + /** * This is for the advanced DOM options that appears when a DOM element is clicked * advanced options like: 'select parent', 'duplicate', 'delete' @@ -654,11 +678,29 @@ function RemoteFunctions(config) { // the element that was clicked let elemBounds = this.element.getBoundingClientRect(); - // check if edit text option should be shown to determine box width + // check which options should be shown to determine box width const showEditTextOption = _shouldShowEditTextOption(this.element); + const showSelectParentOption = _shouldShowSelectParentOption(this.element); - // the box width and the positions where it should be placed - const boxWidth = showEditTextOption ? 106 : 82; + // calculate box width based on visible options + // NOTE: duplicate and delete buttons are always shown + let optionCount = 2; + if (showSelectParentOption) { + optionCount++; + } + if (showEditTextOption) { + optionCount++; + } + + // box width we need to decide based on the no. of options + let boxWidth; + if (optionCount === 2) { + boxWidth = 52; + } else if (optionCount === 3) { + boxWidth = 82; + } else { + boxWidth = 106; + } const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; const scrollTop = window.pageYOffset || document.documentElement.scrollTop; @@ -719,17 +761,23 @@ function RemoteFunctions(config) { ` }; - let content = `
- + let content = `
`; + + // Only include select parent option if element supports it + if (showSelectParentOption) { + content += ` ${ICONS.arrowUp} `; + } - if (showEditTextOption) { // to check if the element is editable + // Only include edit text option if element supports it + if (showEditTextOption) { content += ` ${ICONS.edit} `; } + // Always include duplicate and delete options content += ` ${ICONS.copy} From 19755fb7fbb38be1ef080c44fad223582a56050c Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 19:42:28 +0530 Subject: [PATCH 057/849] fix: unable to edit text inside elements with no text content --- src/LiveDevelopment/LivePreviewEdit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 7a9fc517df..e99f4b7476 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -11,7 +11,7 @@ define(function (require, exports, module) { const openTagEnd = html.indexOf(">") + 1; const closeTagStart = html.lastIndexOf("<"); - if (openTagEnd > 0 && closeTagStart > openTagEnd) { + if (openTagEnd > 0 && closeTagStart >= openTagEnd) { return { openTag: html.substring(0, openTagEnd), closeTag: html.substring(closeTagStart) From c1f519157ab9c907b8e240e09c1242d253553b17 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 20:20:27 +0530 Subject: [PATCH 058/849] fix: more options box gets out of viewport with very long elements --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index ae81b622b4..72849cdc3a 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -713,8 +713,15 @@ function RemoteFunctions(config) { const isOverlap = checkOverlap(elemBounds.width, tagName, id, classes); - // default position (right aligned with element) - let leftPos = elemBounds.right - boxWidth + scrollLeft; + const viewportWidth = window.innerWidth; + const idealLeftPos = elemBounds.right - boxWidth + scrollLeft; + const maxLeftPos = viewportWidth - boxWidth - 10 + scrollLeft; + // 10px is just the padding, because we want some space + const minLeftPos = 10 + scrollLeft; + + // we'll use the position that keeps the box within viewport bounds + let leftPos = Math.min(idealLeftPos, maxLeftPos); + leftPos = Math.max(leftPos, minLeftPos); let topPos; if (isOverlap) { From cb92fa1dddfd5e8f6b8f19a0d78ed7c7ebdb8f52 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 26 Jul 2025 21:24:48 +0530 Subject: [PATCH 059/849] fix: button's onclick was overriding more options box --- .../BrowserScripts/RemoteFunctions.js | 75 +++++++------------ 1 file changed, 25 insertions(+), 50 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 72849cdc3a..b75becbec0 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1028,42 +1028,6 @@ function RemoteFunctions(config) { } }; - function Editor(element) { - this.onBlur = this.onBlur.bind(this); - this.onKeyPress = this.onKeyPress.bind(this); - - this.element = element; - this.element.setAttribute("contenteditable", "true"); - this.element.focus(); - this.element.addEventListener("blur", this.onBlur); - this.element.addEventListener("keypress", this.onKeyPress); - - this.revertText = this.element.innerHTML; - - _trigger(this.element, "edit", 1); - } - - Editor.prototype = { - onBlur: function (event) { - this.element.removeAttribute("contenteditable"); - this.element.removeEventListener("blur", this.onBlur); - this.element.removeEventListener("keypress", this.onKeyPress); - _trigger(this.element, "edit", 0, true); - }, - - onKeyPress: function (event) { - switch (event.which) { - case 13: // return - this.element.blur(); - break; - case 27: // esc - this.element.innerHTML = this.revertText; - this.element.blur(); - break; - } - } - }; - function Highlight(color, trigger) { this.color = color; this.trigger = !!trigger; @@ -1364,19 +1328,7 @@ function RemoteFunctions(config) { } }; - var _currentEditor; - function _toggleEditor(element) { - _currentEditor = new Editor(element); - } - var _currentMenu; - function _toggleMenu(element) { - if (_currentMenu) { - _currentMenu.remove(); - } - _currentMenu = new Menu(element); - } - var _localHighlight; var _remoteHighlight; var _hoverHighlight; @@ -1477,6 +1429,8 @@ function RemoteFunctions(config) { ) { event.preventDefault(); event.stopPropagation(); + event.stopImmediatePropagation(); + if (_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; @@ -1512,6 +1466,26 @@ function RemoteFunctions(config) { } } + /** + * this function handles the double click event + * @param {Event} event + */ + function onDoubleClick(event) { + if ( + isFlagActive && + event.target.hasAttribute("data-brackets-id") && + event.target.tagName !== "BODY" && + event.target.tagName !== "HTML" + ) { + // because we only want to allow double click text editing where we show the edit option + if (_shouldShowEditTextOption(event.target)) { + event.preventDefault(); + event.stopPropagation(); + startEditing(event.target); + } + } + } + function onKeyUp(event) { if (_setup && !_validEvent(event)) { window.document.removeEventListener("keyup", onKeyUp); @@ -1533,7 +1507,7 @@ function RemoteFunctions(config) { window.document.addEventListener("mouseover", onMouseOver); window.document.addEventListener("mouseout", onMouseOut); window.document.addEventListener("mousemove", onMouseMove); - window.document.addEventListener("click", onClick); + window.document.addEventListener("click", onClick, true); _localHighlight = new Highlight("#ecc", true); _setup = true; } @@ -2162,7 +2136,8 @@ function RemoteFunctions(config) { // Add event listeners for hover window.document.addEventListener("mouseover", onElementHover); window.document.addEventListener("mouseout", onElementHoverOut); - window.document.addEventListener("click", onClick); + window.document.addEventListener("click", onClick, true); + window.document.addEventListener("dblclick", onDoubleClick); window.document.addEventListener("dragover", onDragOver); window.document.addEventListener("drop", onDrop); window.document.addEventListener("keydown", onKeyDown); From a38b2f9031de258a709dbc8ed79ee9ff90ea53b9 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 00:47:22 +0530 Subject: [PATCH 060/849] fix: revert code as it broke the existing tests --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index b75becbec0..7b7606f21f 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1507,7 +1507,7 @@ function RemoteFunctions(config) { window.document.addEventListener("mouseover", onMouseOver); window.document.addEventListener("mouseout", onMouseOut); window.document.addEventListener("mousemove", onMouseMove); - window.document.addEventListener("click", onClick, true); + window.document.addEventListener("click", onClick); _localHighlight = new Highlight("#ecc", true); _setup = true; } @@ -2136,7 +2136,7 @@ function RemoteFunctions(config) { // Add event listeners for hover window.document.addEventListener("mouseover", onElementHover); window.document.addEventListener("mouseout", onElementHoverOut); - window.document.addEventListener("click", onClick, true); + window.document.addEventListener("click", onClick); window.document.addEventListener("dblclick", onDoubleClick); window.document.addEventListener("dragover", onDragOver); window.document.addEventListener("drop", onDrop); From 7f4c6cdcd2f83a1132c5fd8ff08339f4659ce485 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 13:40:46 +0530 Subject: [PATCH 061/849] fix: more option box reappearing after operation performed --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 7b7606f21f..6574921e6b 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -860,6 +860,7 @@ function RemoteFunctions(config) { if (this.body && this.body.parentNode && this.body.parentNode === window.document.body) { window.document.body.removeChild(this.body); this.body = null; + _nodeMoreOptionsBox = null; } } }; From 218b316dc4a323b42aa86a665dc849980b5dbfb6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 17:11:40 +0530 Subject: [PATCH 062/849] fix: info box not visible in viewport when element is at the very bottom --- .../BrowserScripts/RemoteFunctions.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 6574921e6b..763af945b9 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -948,6 +948,7 @@ function RemoteFunctions(config) { if (isOverlap) { const windowWidth = window.innerWidth; + const viewportHeight = window.innerHeight; // Estimate the height of the info box based on its content // base height for tag name + padding @@ -963,9 +964,21 @@ function RemoteFunctions(config) { estimatedHeight += 15; } - // align with the bottom of the info box + // check if element is near bottom of viewport + const elementBottomFromViewportTop = elemBounds.bottom; + const availableSpaceBelow = viewportHeight - elementBottomFromViewportTop; + + // align with the bottom of the info box (original behavior) topPos = (elemBounds.top + elemBounds.height - estimatedHeight) + scrollTop; + // If element is near bottom and there's not enough space below, + // push the info box up a bit to prevent scrollbar + if (availableSpaceBelow < estimatedHeight + 10) { + // Push it up by the amount it would overflow + const pushUpAmount = estimatedHeight - availableSpaceBelow; + topPos -= pushUpAmount; + } + // decide whether position at left or right based on available space // check if there's enough space on the left side if (elemBounds.left > boxWidth + 10) { From ab82a76c4a18f4a8da0eb0b777d6c1fd62c974e4 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 18:12:28 +0530 Subject: [PATCH 063/849] fix: more options box not getting hidden after drag & drop operation --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 763af945b9..5ed1e00d6a 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -491,6 +491,7 @@ function RemoteFunctions(config) { _clearDropMarkers(); _dragEndChores(window._currentDraggedElement); + dismissMoreOptionsBox(); delete window._currentDraggedElement; } From 72e5d7220ff9ba95c0c44919f123b6b994c59b36 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 18:53:29 +0530 Subject: [PATCH 064/849] fix: make sure info box is within live preview bounds --- .../BrowserScripts/RemoteFunctions.js | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 5ed1e00d6a..c183f39099 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -991,6 +991,18 @@ function RemoteFunctions(config) { } } + // to make sure that the info box stays under the viewport width + const viewportWidth = window.innerWidth; + const margin = 10; + + // horizontal boundary checking + if (leftPos + boxWidth + margin > viewportWidth + scrollLeft) { + leftPos = viewportWidth + scrollLeft - boxWidth - margin; + } + if (leftPos < scrollLeft + margin) { + leftPos = scrollLeft + margin; + } + const styles = ` .box { background-color: #4285F4; @@ -1583,6 +1595,20 @@ function RemoteFunctions(config) { _clickHighlight.selector = rule; } + // recreate UI boxes (info box and more options box) + function redrawUIBoxes() { + if (_nodeMoreOptionsBox) { + const element = _nodeMoreOptionsBox.element; + _nodeMoreOptionsBox.remove(); + _nodeMoreOptionsBox = new NodeMoreOptionsBox(element); + + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = new NodeInfoBox(element, true); // true means it came from a click + } + } + } + // redraw active highlights function redrawHighlights() { if (_remoteHighlight) { @@ -1594,19 +1620,15 @@ function RemoteFunctions(config) { if (_hoverHighlight) { _hoverHighlight.redraw(); } - if (_nodeMoreOptionsBox) { - const element = _nodeMoreOptionsBox.element; - _nodeMoreOptionsBox.remove(); - _nodeMoreOptionsBox = new NodeMoreOptionsBox(element); + } - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - _nodeInfoBox = new NodeInfoBox(element, true); // true means it came from a click - } - } + // just a wrapper function when we need to redraw highlights as well as UI boxes + function redrawEverything() { + redrawHighlights(); + redrawUIBoxes(); } - window.addEventListener("resize", redrawHighlights); + window.addEventListener("resize", redrawEverything); // Add a capture-phase scroll listener to update highlights when // any element scrolls. @@ -1875,7 +1897,7 @@ function RemoteFunctions(config) { this.rememberedNodes = {}; // update highlight after applying diffs - redrawHighlights(); + redrawEverything(); }; function applyDOMEdits(edits) { @@ -2164,6 +2186,7 @@ function RemoteFunctions(config) { "highlight" : highlight, "highlightRule" : highlightRule, "redrawHighlights" : redrawHighlights, + "redrawEverything" : redrawEverything, "applyDOMEdits" : applyDOMEdits, "getSimpleDOM" : getSimpleDOM, "updateConfig" : updateConfig, From 44699c5939f3568affe1fd9d8ee6124473f0975e Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 19:01:49 +0530 Subject: [PATCH 065/849] fix: remove boxes when user scrolls the live preview --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index c183f39099..d235afba4b 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1642,6 +1642,8 @@ function RemoteFunctions(config) { window.setTimeout(redrawHighlights, 0); } } + + dismissMoreOptionsBox(); } window.addEventListener("scroll", _scrollHandler, true); From 518d693c315926e100b869a1740cc34ce5075427 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 19:04:29 +0530 Subject: [PATCH 066/849] fix: remove more options box when user starts editing --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index d235afba4b..944f91eec4 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -2036,6 +2036,7 @@ function RemoteFunctions(config) { // Make the element editable element.setAttribute("contenteditable", "true"); element.focus(); + dismissMoreOptionsBox(); element._originalContent = cleanupElementProperties(element); From 29f5f2d3aa5d54dd4cc6891bc73140fceeb167e5 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 19:56:07 +0530 Subject: [PATCH 067/849] fix: drag & drop logic breaks when target is after source --- src/LiveDevelopment/LivePreviewEdit.js | 122 +++++++++++++++++++------ 1 file changed, 96 insertions(+), 26 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index e99f4b7476..83e59fc694 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -181,41 +181,111 @@ define(function (require, exports, module) { const sourceText = editor.getTextBetween(sourceRange.from, sourceRange.to); const targetIndent = editor.getTextBetween({ line: targetRange.from.line, ch: 0 }, targetRange.from); - // creating a batch operation so that undo in live preview works fine - editor.document.batchOperation(function () { - // first, we need to remove the source code from its initial position - editor.replaceRange("", sourceRange.from, sourceRange.to); + // Check if source is before target to determine order of operations + // check if the source is before target or after the target + // we need this because + // If source is before target → we need to insert first, then remove + // If target is before source → remove first, then insert + const sourceBeforeTarget = + sourceRange.from.line < targetRange.from.line || + (sourceRange.from.line === targetRange.from.line && sourceRange.from.ch < targetRange.from.ch); + + // this function is to clean up the empty lines after an element is removed + function cleanupAfterRemoval(range) { + const lineToCheck = range.from.line; + + // check if the line where element was removed is now empty + if (lineToCheck < editor.lineCount()) { + const currentLineText = editor.getLine(lineToCheck); + if (currentLineText && currentLineText.trim() === "") { + // remove the empty line + const lineStart = { line: lineToCheck, ch: 0 }; + const lineEnd = { line: lineToCheck + 1, ch: 0 }; + editor.replaceRange("", lineStart, lineEnd); + } + } - // since we remove content from the source, we want to clear the extra line - if(sourceRange.from.line !== 0) { - const prevLineText = editor.getLine(sourceRange.from.line - 1); - const chPrevLine = prevLineText ? prevLineText.length : 0; - editor.replaceRange("", {line: sourceRange.from.line - 1, ch: chPrevLine}, sourceRange.from); + // also we need to check the previous line if it became empty + if (lineToCheck > 0) { + const prevLineText = editor.getLine(lineToCheck - 1); + if (prevLineText && prevLineText.trim() === "") { + const lineStart = { line: lineToCheck - 1, ch: 0 }; + const lineEnd = { line: lineToCheck, ch: 0 }; + editor.replaceRange("", lineStart, lineEnd); + } } + } + + // this function is to make sure that we insert elements with proper indentation + function insertElementWithIndentation(insertPos, insertAfterMode, useTargetIndent) { + const indent = useTargetIndent ? targetIndent : targetIndent; + + if (insertAfterMode) { + // Insert after the target element + editor.replaceRange("\n" + indent + sourceText, insertPos); + } else { + // Insert before the target element + const insertLine = insertPos.line; + const lineStart = { line: insertLine, ch: 0 }; + + // Get current line content to preserve any existing indentation structure + const currentLine = editor.getLine(insertLine); - // recalculate the target range, as the source text is not removed - const updatedTargetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); - if (!updatedTargetRange) { - return; + if (currentLine && currentLine.trim() === "") { + // the line is empty, replace it entirely + editor.replaceRange(indent + sourceText, lineStart, { line: insertLine, ch: currentLine.length }); + } else { + // the line has content, insert before it + editor.replaceRange(indent + sourceText + "\n", lineStart); + } } + } - if (insertAfter) { - const insertPos = { - line: updatedTargetRange.to.line, - ch: updatedTargetRange.to.ch - }; + // creating a batch operation so that undo in live preview works fine + editor.document.batchOperation(function () { + if (sourceBeforeTarget) { + // this handles the case when source is before target: insert first, then remove + if (insertAfter) { + const insertPos = { + line: targetRange.to.line, + ch: targetRange.to.ch + }; + insertElementWithIndentation(insertPos, true, true); + } else { + // insert before target + insertElementWithIndentation(targetRange.from, false, true); + } - editor.replaceRange("\n" + targetIndent + sourceText, insertPos); + // Now remove the source element (NOTE: the positions have shifted) + const updatedSourceRange = HTMLInstrumentation.getPositionFromTagId(editor, sourceId); + if (updatedSourceRange) { + editor.replaceRange("", updatedSourceRange.from, updatedSourceRange.to); + cleanupAfterRemoval(updatedSourceRange); + } } else { - // insert before - const targetText = editor.getTextBetween(updatedTargetRange.from, updatedTargetRange.to); + // This handles the case when target is before source: remove first, then insert + // Store source range before removal + const originalSourceRange = { ...sourceRange }; + + // Remove the source element first + editor.replaceRange("", sourceRange.from, sourceRange.to); + cleanupAfterRemoval(originalSourceRange); + + // Recalculate target range after source removal as the positions have shifted + const updatedTargetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); + if (!updatedTargetRange) { + return; + } - // to check if there is only indentation and no text before it - if (targetIndent.trim() === "") { - const finalText = sourceText + '\n' + targetIndent + targetText; - editor.replaceRange(finalText, updatedTargetRange.from, updatedTargetRange.to); + if (insertAfter) { + const insertPos = { + line: updatedTargetRange.to.line, + ch: updatedTargetRange.to.ch + }; + insertElementWithIndentation(insertPos, true, true); } else { - editor.replaceRange(sourceText + targetText, updatedTargetRange.from, updatedTargetRange.to); + // Insert before target + insertElementWithIndentation(updatedTargetRange.from, false, true); } } }); From 4de8d9a05b80e4e7bfbe18fa06d2e6f86dc40c24 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 20:43:04 +0530 Subject: [PATCH 068/849] fix: move cursor to end of the text content when editing a text --- .../BrowserScripts/RemoteFunctions.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 944f91eec4..340327b9f3 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -2027,6 +2027,19 @@ function RemoteFunctions(config) { return dismissed; } + /** + * This function is responsible to move the cursor to the end of the text content when we start editing + * @param {DOMElement} element + */ + function moveCursorToEnd(element) { + const selection = window.getSelection(); + const range = document.createRange(); + range.selectNodeContents(element); + range.collapse(false); + selection.removeAllRanges(); + selection.addRange(range); + } + // Function to handle direct editing of elements in the live preview function startEditing(element) { if (!element) { @@ -2036,6 +2049,8 @@ function RemoteFunctions(config) { // Make the element editable element.setAttribute("contenteditable", "true"); element.focus(); + + moveCursorToEnd(element); dismissMoreOptionsBox(); element._originalContent = cleanupElementProperties(element); @@ -2137,6 +2152,7 @@ function RemoteFunctions(config) { // Remove contenteditable attribute element.removeAttribute("contenteditable"); + dismissMoreOptionsBox(); // Remove event listeners if (element._editListeners) { From 52d90c95eaa6a6ad8f3b15b5c3202b97bcd468ef Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 27 Jul 2025 21:29:28 +0530 Subject: [PATCH 069/849] fix: unable to select text because start editing was called again and again --- .../BrowserScripts/RemoteFunctions.js | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 340327b9f3..76e5b16fbb 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -893,7 +893,7 @@ function RemoteFunctions(config) { // this value decides where we need to show the box in the UI // we are creating this here, because if the element has IDs and Classes then we need to increase the value // so that the box doesn't obscure the element - let pushBoxUp = 28; // px value + let pushBoxUp = 32; // px value // get the ID and classes for that element, as we need to display it in the box const id = this.element.id; @@ -905,7 +905,7 @@ function RemoteFunctions(config) { // Add ID if present if (id) { content += "
#" + id + "
"; - pushBoxUp += 16; + pushBoxUp += 20; } // Add classes (limit to 3 with dropdown indicator) @@ -918,7 +918,7 @@ function RemoteFunctions(config) { content += "+" + (classes.length - 3) + " more"; } content += "
"; - pushBoxUp += 16; + pushBoxUp += 20; } let leftPos = elemBounds.left + scrollLeft; @@ -941,7 +941,6 @@ function RemoteFunctions(config) { // Calculate estimated width based on character count // Formula: base padding + (character count * average character width) const boxWidth = basePadding + (charCount * avgCharWidth); - const boxHeight = 40 + (id ? 16 : 0) + (classes.length > 0 ? 16 : 0); // rough estimate // we need to check for overlap if this is from a click if (this.isFromClick) { @@ -953,16 +952,16 @@ function RemoteFunctions(config) { // Estimate the height of the info box based on its content // base height for tag name + padding - let estimatedHeight = 20; + let estimatedHeight = 32; // height adjustment if ID is present if (id) { - estimatedHeight += 15; + estimatedHeight += 20; } // height adjustment if classes are present if (classes.length > 0) { - estimatedHeight += 15; + estimatedHeight += 20; } // check if element is near bottom of viewport @@ -2031,8 +2030,7 @@ function RemoteFunctions(config) { * This function is responsible to move the cursor to the end of the text content when we start editing * @param {DOMElement} element */ - function moveCursorToEnd(element) { - const selection = window.getSelection(); + function moveCursorToEnd(selection, element) { const range = document.createRange(); range.selectNodeContents(element); range.collapse(false); @@ -2050,7 +2048,12 @@ function RemoteFunctions(config) { element.setAttribute("contenteditable", "true"); element.focus(); - moveCursorToEnd(element); + // Move cursor to end if no existing selection + const selection = window.getSelection(); + if (selection.rangeCount === 0 || selection.isCollapsed) { + moveCursorToEnd(selection, element); + } + dismissMoreOptionsBox(); element._originalContent = cleanupElementProperties(element); From bb9c0ccb161ba27bc3bf71a60a66b72707bb175b Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 28 Jul 2025 00:20:53 +0530 Subject: [PATCH 070/849] fix: text content becomes undefined when user presses escape --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 76e5b16fbb..8b229273ca 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -2066,13 +2066,12 @@ function RemoteFunctions(config) { function onKeyDown(event) { if (event.key === "Escape") { // Cancel editing - element.innerHTML = element._originalContent; - finishEditing(element); event.preventDefault(); + finishEditing(element); } else if (event.key === "Enter" && !event.shiftKey) { // Finish editing on Enter (unless Shift is held) - finishEditing(element); event.preventDefault(); + finishEditing(element); } } From 4f37db15d72105123653dc5e1b064e081722191b Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 30 Jul 2025 23:27:38 +0530 Subject: [PATCH 071/849] fix: duplication and deletion gives syntax error when code is not beautified --- src/LiveDevelopment/LivePreviewEdit.js | 49 ++++++++++++++++---------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 83e59fc694..c0f26ffedc 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -1,6 +1,7 @@ define(function (require, exports, module) { const HTMLInstrumentation = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"); const LiveDevMultiBrowser = require("LiveDevelopment/LiveDevMultiBrowser"); + const CodeMirror = require("thirdparty/CodeMirror/lib/codemirror"); /** * this is a helper function to find the content boundaries in HTML @@ -82,36 +83,42 @@ define(function (require, exports, module) { return; } - // this will give us the start pos and end pos of the DOM element in the source code - // can be referenced using range.from and range.to - const range = HTMLInstrumentation.getPositionFromTagId(editor, tagId); - if (!range) { + // get the start range from the getPositionFromTagId function + // and we get the end range from the findMatchingTag function + // NOTE: we cannot get the end range from getPositionFromTagId + // because on non-beautified code getPositionFromTagId may not provide correct end position + const startRange = HTMLInstrumentation.getPositionFromTagId(editor, tagId); + const endRange = CodeMirror.findMatchingTag(editor._codeMirror, editor.getCursorPos()); + + if (!startRange || !endRange) { return; } + const startPos = startRange.from; + const endPos = endRange.close.to; // this is the actual source code for the element that we need to duplicate - const text = editor.getTextBetween(range.from, range.to); + const text = editor.getTextBetween(startPos, endPos); // this is the indentation on the line - const indent = editor.getTextBetween({ line: range.from.line, ch: 0 }, range.from); + const indent = editor.getTextBetween({ line: startPos.line, ch: 0 }, startPos); editor.document.batchOperation(function () { // make sure there is only indentation and no text before it if (indent.trim() === "") { // this is the position where we need to insert // we're giving the char as 0 because since we insert a new line using '\n' - // that's why writing any char value will not work, as the line is empty + // that's why writing any char value will not work, as the line is emptys // and codemirror doesn't allow to insert at a column (ch) greater than the length of the line // So, the logic is to just append the indent before the text at this insertPos const insertPos = { - line: range.from.line + (range.to.line - range.from.line + 1), + line: startPos.line + (endPos.line - startPos.line + 1), ch: 0 }; - editor.replaceRange("\n", range.to); + editor.replaceRange("\n", endPos); editor.replaceRange(indent + text, insertPos); } else { // if there is some text, we just add the duplicated text right next to it - editor.replaceRange(text, range.from); + editor.replaceRange(text, startPos); } }); } @@ -132,21 +139,27 @@ define(function (require, exports, module) { return; } - // this will give us the start pos and end pos of the DOM element in the source code - // can be referenced using range.from and range.to - const range = HTMLInstrumentation.getPositionFromTagId(editor, tagId); - if (!range) { + // get the start range from the getPositionFromTagId function + // and we get the end range from the findMatchingTag function + // NOTE: we cannot get the end range from getPositionFromTagId + // because on non-beautified code getPositionFromTagId may not provide correct end position + const startRange = HTMLInstrumentation.getPositionFromTagId(editor, tagId); + const endRange = CodeMirror.findMatchingTag(editor._codeMirror, editor.getCursorPos()); + + if (!startRange || !endRange) { return; } + const startPos = startRange.from; + const endPos = endRange.close.to; editor.document.batchOperation(function () { - editor.replaceRange("", range.from, range.to); + editor.replaceRange("", startPos, endPos); // since we remove content from the source, we want to clear the extra line - if(range.from.line !== 0) { - const prevLineText = editor.getLine(range.from.line - 1); + if(startPos.line !== 0 && !(editor.getLine(startPos.line).trim())) { + const prevLineText = editor.getLine(startPos.line - 1); const chPrevLine = prevLineText ? prevLineText.length : 0; - editor.replaceRange("", {line: range.from.line - 1, ch: chPrevLine}, range.from); + editor.replaceRange("", {line: startPos.line - 1, ch: chPrevLine}, startPos); } }); } From c24875a5d6cfd87f24e377ff132a30c6474ec5e6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 30 Jul 2025 23:45:50 +0530 Subject: [PATCH 072/849] fix: use start range from instead of the current cursor position to find the matching tag --- src/LiveDevelopment/LivePreviewEdit.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index c0f26ffedc..e3179636e0 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -88,11 +88,15 @@ define(function (require, exports, module) { // NOTE: we cannot get the end range from getPositionFromTagId // because on non-beautified code getPositionFromTagId may not provide correct end position const startRange = HTMLInstrumentation.getPositionFromTagId(editor, tagId); - const endRange = CodeMirror.findMatchingTag(editor._codeMirror, editor.getCursorPos()); + if(!startRange) { + return; + } - if (!startRange || !endRange) { + const endRange = CodeMirror.findMatchingTag(editor._codeMirror, startRange.from); + if (!endRange) { return; } + const startPos = startRange.from; const endPos = endRange.close.to; @@ -144,11 +148,15 @@ define(function (require, exports, module) { // NOTE: we cannot get the end range from getPositionFromTagId // because on non-beautified code getPositionFromTagId may not provide correct end position const startRange = HTMLInstrumentation.getPositionFromTagId(editor, tagId); - const endRange = CodeMirror.findMatchingTag(editor._codeMirror, editor.getCursorPos()); + if(!startRange) { + return; + } - if (!startRange || !endRange) { + const endRange = CodeMirror.findMatchingTag(editor._codeMirror, startRange.from); + if (!endRange) { return; } + const startPos = startRange.from; const endPos = endRange.close.to; From 018a5868d9c1127492ea4a4d70096b9ae5d065f7 Mon Sep 17 00:00:00 2001 From: Pluto Date: Wed, 30 Jul 2025 23:52:07 +0530 Subject: [PATCH 073/849] fix: use findMatchingTag to get the end position as it is more robust --- src/LiveDevelopment/LivePreviewEdit.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index e3179636e0..09ef5efe27 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -44,12 +44,24 @@ define(function (require, exports, module) { } const editor = currLiveDoc.editor; - const range = HTMLInstrumentation.getPositionFromTagId(editor, message.tagId); - if (!range) { + // get the start range from the getPositionFromTagId function + // and we get the end range from the findMatchingTag function + // NOTE: we cannot get the end range from getPositionFromTagId + // because on non-beautified code getPositionFromTagId may not provide correct end position + const startRange = HTMLInstrumentation.getPositionFromTagId(editor, message.tagId); + if(!startRange) { + return; + } + + const endRange = CodeMirror.findMatchingTag(editor._codeMirror, startRange.from); + if (!endRange) { return; } - const text = editor.getTextBetween(range.from, range.to); + const startPos = startRange.from; + const endPos = endRange.close.to; + + const text = editor.getTextBetween(startPos, endPos); let splittedText; // we need to find the content boundaries to find exactly where the content starts and where it ends @@ -61,7 +73,7 @@ define(function (require, exports, module) { // if the text split was done successfully, apply the edit if (splittedText && splittedText.length === 2) { const finalText = splittedText[0] + message.newContent + splittedText[1]; - editor.replaceRange(finalText, range.from, range.to); + editor.replaceRange(finalText, startPos, endPos); } else { console.error("Live preview text edit operation failed."); } From 4fc035ec7579d493366487772d532b6200bba6f2 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 31 Jul 2025 00:17:31 +0530 Subject: [PATCH 074/849] fix: fix architecture of move function by using the getMatchingTag function to get the end pos --- src/LiveDevelopment/LivePreviewEdit.js | 191 ++++++++++++++++--------- 1 file changed, 125 insertions(+), 66 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 09ef5efe27..6fc3f5a962 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -184,6 +184,67 @@ define(function (require, exports, module) { }); } + /** + * this function is to clean up the empty lines after an element is removed + * @param {Object} editor - the editor instance + * @param {Object} range - the range where element was removed + */ + function _cleanupAfterRemoval(editor, range) { + const lineToCheck = range.from.line; + + // check if the line where element was removed is now empty + if (lineToCheck < editor.lineCount()) { + const currentLineText = editor.getLine(lineToCheck); + if (currentLineText && currentLineText.trim() === "") { + // remove the empty line + const lineStart = { line: lineToCheck, ch: 0 }; + const lineEnd = { line: lineToCheck + 1, ch: 0 }; + editor.replaceRange("", lineStart, lineEnd); + } + } + + // also we need to check the previous line if it became empty + if (lineToCheck > 0) { + const prevLineText = editor.getLine(lineToCheck - 1); + if (prevLineText && prevLineText.trim() === "") { + const lineStart = { line: lineToCheck - 1, ch: 0 }; + const lineEnd = { line: lineToCheck, ch: 0 }; + editor.replaceRange("", lineStart, lineEnd); + } + } + } + + /** + * this function is to make sure that we insert elements with proper indentation + * + * @param {Object} editor - the editor instance + * @param {Object} insertPos - position where to insert + * @param {Boolean} insertAfterMode - whether to insert after the position + * @param {String} targetIndent - the indentation to use + * @param {String} sourceText - the text to insert + */ + function _insertElementWithIndentation(editor, insertPos, insertAfterMode, targetIndent, sourceText) { + if (insertAfterMode) { + // Insert after the target element + editor.replaceRange("\n" + targetIndent + sourceText, insertPos); + } else { + // Insert before the target element + const insertLine = insertPos.line; + const lineStart = { line: insertLine, ch: 0 }; + + // Get current line content to preserve any existing indentation structure + const currentLine = editor.getLine(insertLine); + + if (currentLine && currentLine.trim() === "") { + // the line is empty, replace it entirely + editor.replaceRange(targetIndent + sourceText, lineStart, { line: insertLine, ch: currentLine.length }); + } else { + // the line has content, insert before it + editor.replaceRange(targetIndent + sourceText + "\n", lineStart); + } + } + } + /** * This function is responsible for moving an element from one position to another in the source code * it is called when there is drag-drop in the live preview @@ -203,14 +264,40 @@ define(function (require, exports, module) { return; } - // position of source and target elements in the editor - const sourceRange = HTMLInstrumentation.getPositionFromTagId(editor, sourceId); - const targetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); + // get the start range from the getPositionFromTagId function + // and we get the end range from the findMatchingTag function + // NOTE: we cannot get the end range from getPositionFromTagId + // because on non-beautified code getPositionFromTagId may not provide correct end position + const sourceStartRange = HTMLInstrumentation.getPositionFromTagId(editor, sourceId); + if(!sourceStartRange) { + return; + } + + const sourceEndRange = CodeMirror.findMatchingTag(editor._codeMirror, sourceStartRange.from); + if (!sourceEndRange) { + return; + } + + const targetStartRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); + if(!targetStartRange) { + return; + } - if (!sourceRange || !targetRange) { + const targetEndRange = CodeMirror.findMatchingTag(editor._codeMirror, targetStartRange.from); + if (!targetEndRange) { return; } + const sourceRange = { + from: sourceStartRange.from, + to: sourceEndRange.close.to + }; + + const targetRange = { + from: targetStartRange.from, + to: targetEndRange.close.to + }; + const sourceText = editor.getTextBetween(sourceRange.from, sourceRange.to); const targetIndent = editor.getTextBetween({ line: targetRange.from.line, ch: 0 }, targetRange.from); @@ -223,57 +310,6 @@ define(function (require, exports, module) { sourceRange.from.line < targetRange.from.line || (sourceRange.from.line === targetRange.from.line && sourceRange.from.ch < targetRange.from.ch); - // this function is to clean up the empty lines after an element is removed - function cleanupAfterRemoval(range) { - const lineToCheck = range.from.line; - - // check if the line where element was removed is now empty - if (lineToCheck < editor.lineCount()) { - const currentLineText = editor.getLine(lineToCheck); - if (currentLineText && currentLineText.trim() === "") { - // remove the empty line - const lineStart = { line: lineToCheck, ch: 0 }; - const lineEnd = { line: lineToCheck + 1, ch: 0 }; - editor.replaceRange("", lineStart, lineEnd); - } - } - - // also we need to check the previous line if it became empty - if (lineToCheck > 0) { - const prevLineText = editor.getLine(lineToCheck - 1); - if (prevLineText && prevLineText.trim() === "") { - const lineStart = { line: lineToCheck - 1, ch: 0 }; - const lineEnd = { line: lineToCheck, ch: 0 }; - editor.replaceRange("", lineStart, lineEnd); - } - } - } - - // this function is to make sure that we insert elements with proper indentation - function insertElementWithIndentation(insertPos, insertAfterMode, useTargetIndent) { - const indent = useTargetIndent ? targetIndent : targetIndent; - - if (insertAfterMode) { - // Insert after the target element - editor.replaceRange("\n" + indent + sourceText, insertPos); - } else { - // Insert before the target element - const insertLine = insertPos.line; - const lineStart = { line: insertLine, ch: 0 }; - - // Get current line content to preserve any existing indentation structure - const currentLine = editor.getLine(insertLine); - - if (currentLine && currentLine.trim() === "") { - // the line is empty, replace it entirely - editor.replaceRange(indent + sourceText, lineStart, { line: insertLine, ch: currentLine.length }); - } else { - // the line has content, insert before it - editor.replaceRange(indent + sourceText + "\n", lineStart); - } - } - } - // creating a batch operation so that undo in live preview works fine editor.document.batchOperation(function () { if (sourceBeforeTarget) { @@ -283,17 +319,27 @@ define(function (require, exports, module) { line: targetRange.to.line, ch: targetRange.to.ch }; - insertElementWithIndentation(insertPos, true, true); + _insertElementWithIndentation(editor, insertPos, true, targetIndent, sourceText); } else { // insert before target - insertElementWithIndentation(targetRange.from, false, true); + _insertElementWithIndentation(editor, targetRange.from, false, targetIndent, sourceText); } // Now remove the source element (NOTE: the positions have shifted) - const updatedSourceRange = HTMLInstrumentation.getPositionFromTagId(editor, sourceId); - if (updatedSourceRange) { - editor.replaceRange("", updatedSourceRange.from, updatedSourceRange.to); - cleanupAfterRemoval(updatedSourceRange); + const updatedSourceStartRange = HTMLInstrumentation.getPositionFromTagId(editor, sourceId); + if (updatedSourceStartRange) { + const updatedSourceEndRange = CodeMirror.findMatchingTag( + editor._codeMirror, updatedSourceStartRange.from + ); + + if (updatedSourceEndRange) { + const updatedSourceRange = { + from: updatedSourceStartRange.from, + to: updatedSourceEndRange.close.to + }; + editor.replaceRange("", updatedSourceRange.from, updatedSourceRange.to); + _cleanupAfterRemoval(editor, updatedSourceRange); + } } } else { // This handles the case when target is before source: remove first, then insert @@ -302,23 +348,36 @@ define(function (require, exports, module) { // Remove the source element first editor.replaceRange("", sourceRange.from, sourceRange.to); - cleanupAfterRemoval(originalSourceRange); + _cleanupAfterRemoval(editor, originalSourceRange); // Recalculate target range after source removal as the positions have shifted - const updatedTargetRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); - if (!updatedTargetRange) { + const updatedTargetStartRange = HTMLInstrumentation.getPositionFromTagId(editor, targetId); + if (!updatedTargetStartRange) { return; } + const updatedTargetEndRange = CodeMirror.findMatchingTag( + editor._codeMirror, updatedTargetStartRange.from + ); + + if (!updatedTargetEndRange) { + return; + } + + const updatedTargetRange = { + from: updatedTargetStartRange.from, + to: updatedTargetEndRange.close.to + }; + if (insertAfter) { const insertPos = { line: updatedTargetRange.to.line, ch: updatedTargetRange.to.ch }; - insertElementWithIndentation(insertPos, true, true); + _insertElementWithIndentation(editor, insertPos, true, targetIndent, sourceText); } else { // Insert before target - insertElementWithIndentation(updatedTargetRange.from, false, true); + _insertElementWithIndentation(editor, updatedTargetRange.from, false, targetIndent, sourceText); } } }); From ae230eae50f8fcc93038fc81574b6c023fab9298 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 1 Aug 2025 00:18:41 +0530 Subject: [PATCH 075/849] fix: browser removing incorrect css syntax from code which is unintended behaviour --- .../BrowserScripts/RemoteFunctions.js | 135 +------------- src/LiveDevelopment/LivePreviewEdit.js | 167 ++++++++++++++---- 2 files changed, 138 insertions(+), 164 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 8b229273ca..79e2ba865f 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1905,57 +1905,6 @@ function RemoteFunctions(config) { _editHandler.apply(edits); } - /** - * - * @param {Element} elem - */ - function _domElementToJSON(elem) { - var json = { tag: elem.tagName.toLowerCase(), attributes: {}, children: [] }, - i, - len, - node, - value; - - len = elem.attributes.length; - for (i = 0; i < len; i++) { - node = elem.attributes.item(i); - - // skip internal attributes that shouldn't be serialized - if (node.name === "draggable" && node.value === "true") { - continue; - } - value = (node.name === "data-brackets-id") ? parseInt(node.value, 10) : node.value; - // Clean internal style properties - if (node.name === "style") { - const cleanedStyle = _cleanInternalStyles(value); - - if (cleanedStyle.trim() === '') { - continue; // Skip empty style attribute - } - value = cleanedStyle; - } - json.attributes[node.name] = value; - } - - len = elem.childNodes.length; - for (i = 0; i < len; i++) { - node = elem.childNodes.item(i); - - // ignores comment nodes and visuals generated by live preview - if (node.nodeType === Node.ELEMENT_NODE && node.className !== HIGHLIGHT_CLASSNAME) { - json.children.push(_domElementToJSON(node)); - } else if (node.nodeType === Node.TEXT_NODE) { - json.children.push({ content: node.nodeValue }); - } - } - - return json; - } - - function getSimpleDOM() { - return JSON.stringify(_domElementToJSON(window.document.documentElement)); - } - function updateConfig(newConfig) { var oldConfig = config; config = JSON.parse(newConfig); @@ -2056,9 +2005,6 @@ function RemoteFunctions(config) { dismissMoreOptionsBox(); - element._originalContent = cleanupElementProperties(element); - - // Add event listeners for editing function onBlur() { finishEditing(element); } @@ -2067,7 +2013,7 @@ function RemoteFunctions(config) { if (event.key === "Escape") { // Cancel editing event.preventDefault(); - finishEditing(element); + finishEditing(element, false); // false means that the edit operation was cancelled } else if (event.key === "Enter" && !event.shiftKey) { // Finish editing on Enter (unless Shift is held) event.preventDefault(); @@ -2085,69 +2031,9 @@ function RemoteFunctions(config) { }; } - // Helper function to clean internal style properties - function _cleanInternalStyles(styleValue) { - if (typeof styleValue !== "string") { - return styleValue; - } - - let cleanedStyle = styleValue; - - // remove internal background color - cleanedStyle = cleanedStyle.replace(/background-color:\s*rgba\(0,\s*162,\s*255,\s*0\.2\)\s*;?\s*/gi, ""); - - // remove internal outline - cleanedStyle = cleanedStyle.replace(/outline:\s*rgb\(66,\s*133,\s*244\)\s+solid\s+1px\s*;?\s*/gi, ""); - cleanedStyle = cleanedStyle.replace(/outline:\s*1px\s+solid\s+#4285F4\s*;?\s*/gi, ""); - - // clean up any extra spaces or semicolons - cleanedStyle = cleanedStyle - .replace(/;\s*;/g, ";") - .replace(/^\s*;\s*/, "") - .replace(/\s*;\s*$/, ""); - - return cleanedStyle; - } - - // this function is to remove the internal properties from elements before getting the innerHTML - // then add all the properties back to the elements - // internal properties such as 'data-brackets-id', 'data-ld-highlight' etc - function cleanupElementProperties(element) { - const clone = element.cloneNode(true); - const allElements = [clone, ...clone.querySelectorAll('*')]; - - allElements.forEach(el => { - // Remove Phoenix internal attributes - if (el.hasAttribute('data-brackets-id')) { - el.removeAttribute('data-brackets-id'); - } - if (el.hasAttribute('data-ld-highlight')) { - el.removeAttribute('data-ld-highlight'); - } - - // remove the draggable attribute added internally - if (el.hasAttribute('draggable')) { - el.removeAttribute('draggable'); - } - - // remove internal style properties - if (el.hasAttribute('style')) { - const style = el.getAttribute('style'); - const cleanedStyle = _cleanInternalStyles(style); - - if (cleanedStyle.trim() === '') { - el.removeAttribute('style'); - } else { - el.setAttribute('style', cleanedStyle); - } - } - }); - - return clone.innerHTML; - } - // Function to finish editing and apply changes - function finishEditing(element) { + // isEditSuccessful: this is a boolean value, defaults to true. false only when the edit operation is cancelled + function finishEditing(element, isEditSuccessful = true) { if (!element || !element.hasAttribute("contenteditable")) { return; } @@ -2163,23 +2049,17 @@ function RemoteFunctions(config) { delete element._editListeners; } - // Get the new content after cleaning up unwanted properties - const newContent = cleanupElementProperties(element); - - // If content has changed, send the edit to the editor - if (newContent !== element._originalContent && element.hasAttribute("data-brackets-id")) { + if (element.hasAttribute("data-brackets-id")) { const tagId = element.getAttribute("data-brackets-id"); window._Brackets_MessageBroker.send({ livePreviewEditEnabled: true, + livePreviewTextEdit: true, element: element, - newContent: newContent, + newContent: element.outerHTML, tagId: Number(tagId), - livePreviewTextEdit: true + isEditSuccessful: isEditSuccessful }); } - - // Clean up - delete element._originalContent; } // init @@ -2209,7 +2089,6 @@ function RemoteFunctions(config) { "redrawHighlights" : redrawHighlights, "redrawEverything" : redrawEverything, "applyDOMEdits" : applyDOMEdits, - "getSimpleDOM" : getSimpleDOM, "updateConfig" : updateConfig, "startEditing" : startEditing, "finishEditing" : finishEditing, diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 6fc3f5a962..fa2846d453 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -4,39 +4,131 @@ define(function (require, exports, module) { const CodeMirror = require("thirdparty/CodeMirror/lib/codemirror"); /** - * this is a helper function to find the content boundaries in HTML - * @param {string} html - The HTML string to parse - * @return {Object} - Object with openTag and closeTag properties + * This function is to sync text content changes between the original source code + * and the live preview DOM after a text edit operation + * + * @param {String} oldContent - the original source code from the editor + * @param {String} newContent - the DOM element's outerHTML after editing in live preview + * @returns {String} - the updated content that should replace the original code in the editor + * + * NOTE: This function is a bit complex to read, read this jsdoc to understand the flow: + * + * First, we parse both the old and new content using DOMParser to get proper HTML DOM structures + * Then we compare each element and text node between the old and new content + * + * the main goal is that we ONLY want to update text content, and not element nodes or their attributes + * because if we allow element/attribute changes, the browser might try to fix the HTML + * to make it syntactically correct or to make it efficient, which would mess up the user's original code + * We don't want that - we need to respect how the user wrote their code + * For example: if user wrote
+ * The browser sees this is invalid CSS and would remove the color attribute entirely + * We want to keep that invalid code as it is because it's what the user wanted to do + * + * Here's how the comparison works: + * - if both nodes are text: update the old text with the new text + * - if both nodes are elements: we recursively check their children (for nested content) + * - if old is text, new is element: replace text with element (like when user adds
) + * - if old is element, new is text: replace element with text (like when user removes
) + * note: when adding new elements (like
tags), we only copy the tag name and content, + * never the attributes, to avoid internal Phoenix properties leaking into user's code */ - function _findContentBoundaries(html) { - const openTagEnd = html.indexOf(">") + 1; - const closeTagStart = html.lastIndexOf("<"); - - if (openTagEnd > 0 && closeTagStart >= openTagEnd) { - return { - openTag: html.substring(0, openTagEnd), - closeTag: html.substring(closeTagStart) - }; + function _syncTextContentChanges(oldContent, newContent) { + const parser = new DOMParser(); + const oldDoc = parser.parseFromString(oldContent, "text/html"); + const newDoc = parser.parseFromString(newContent, "text/html"); + + // as DOM parser will add the complete html structure with the HTML tags and all, + // so we just need to get the main content + const oldRoot = oldDoc.body; + const newRoot = newDoc.body; + + // here oldNode and newNode are full HTML elements which are direct children of the body tag + function syncText(oldNode, newNode) { + if (!oldNode || !newNode) { + return; + } + + // if both the oldNode and newNode has text, replace the old node's text content with the new one + if (oldNode.nodeType === Node.TEXT_NODE && newNode.nodeType === Node.TEXT_NODE) { + oldNode.nodeValue = newNode.nodeValue; + + } else if ( + // if both have element node, then we recursively get their child elements + // this is so that we can get & update the text content in deeply nested DOM + oldNode.nodeType === Node.ELEMENT_NODE && + newNode.nodeType === Node.ELEMENT_NODE + ) { + + const oldChildren = oldNode.childNodes; + const newChildren = newNode.childNodes; + + const minLength = Math.min(oldChildren.length, newChildren.length); + + for (let i = 0; i < minLength; i++) { + syncText(oldChildren[i], newChildren[i]); + } + + // append if there are any new nodes, this is mainly when
tags needs to be inserted + // as user pressed shift + enter to create empty lines in the new content + for (let i = minLength; i < newChildren.length; i++) { + const newChild = newChildren[i]; + let cleanChild; + + if (newChild.nodeType === Node.ELEMENT_NODE) { + // only the element name and not its attributes + // this is to prevent internal properties like data-brackets-id, etc to appear in users code + cleanChild = document.createElement(newChild.tagName); + cleanChild.innerHTML = newChild.innerHTML; + } else { + // for text nodes, comment nodes, etc. clone normally + cleanChild = newChild.cloneNode(true); + } + + oldNode.appendChild(cleanChild); + } + + // remove extra old nodes (maybe extra
's were removed) + for (let i = oldChildren.length - 1; i >= newChildren.length; i--) { + oldNode.removeChild(oldChildren[i]); + } + + } else if (oldNode.nodeType === Node.TEXT_NODE && newNode.nodeType === Node.ELEMENT_NODE) { + // when old has text node and new has element node + // this generally happens when we remove the complete content which results in empty
tag + // for ex:
hello
, here if we remove the 'hello' from live preview then result will be + //

+ const replacement = document.createElement(newNode.tagName); + replacement.innerHTML = newNode.innerHTML; + oldNode.parentNode.replaceChild(replacement, oldNode); + } else if (oldNode.nodeType === Node.ELEMENT_NODE && newNode.nodeType === Node.TEXT_NODE) { + // this is opposite of previous one when earlier it was just
or some tag + // and now we add text content in that + const replacement = document.createTextNode(newNode.nodeValue); + oldNode.parentNode.replaceChild(replacement, oldNode); + } + } + + const oldEls = oldRoot.children; + const newEls = newRoot.children; + + for (let i = 0; i < Math.min(oldEls.length, newEls.length); i++) { + syncText(oldEls[i], newEls[i]); } - return null; + return oldRoot.innerHTML; } /** * this function handles the text edit in the source code when user updates the text in the live preview + * * @param {Object} message - the message object - * { - * livePreviewEditEnabled: true, - element: the DOM element that was modified, - oldContent: the text that was present before the edit, - newContent: the new text, - tagId: data-brackets-id of the DOM element, - livePreviewTextEdit: true - } - * - * The logic is: get the text in the editor using the tagId. split that text using the old content - * join the text back and add the new content in between - */ + * - livePreviewEditEnabled: true + * - livePreviewTextEdit: true + * - element: element + * - newContent: element.outerHTML (the edited content from live preview) + * - tagId: Number (data-brackets-id of the edited element) + * - isEditSuccessful: boolean (false when user pressed Escape to cancel, otherwise true always) + */ function _editTextInSource(message) { const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(); if (!currLiveDoc || !currLiveDoc.editor || !message.tagId) { @@ -44,6 +136,7 @@ define(function (require, exports, module) { } const editor = currLiveDoc.editor; + // get the start range from the getPositionFromTagId function // and we get the end range from the findMatchingTag function // NOTE: we cannot get the end range from getPositionFromTagId @@ -62,20 +155,22 @@ define(function (require, exports, module) { const endPos = endRange.close.to; const text = editor.getTextBetween(startPos, endPos); - let splittedText; - // we need to find the content boundaries to find exactly where the content starts and where it ends - const boundaries = _findContentBoundaries(text); - if (boundaries) { - splittedText = [boundaries.openTag, boundaries.closeTag]; - } + // if the edit was cancelled (mainly by pressing Escape key) + // we just replace the same text with itself + // this is a quick trick because as the code is changed for that element in the file, + // the live preview for that element gets refreshed and the changes are discarded in the live preview + if(!message.isEditSuccessful) { + editor.replaceRange(text, startPos, endPos); + } else { - // if the text split was done successfully, apply the edit - if (splittedText && splittedText.length === 2) { - const finalText = splittedText[0] + message.newContent + splittedText[1]; + // if the edit operation was successful, we call a helper function that + // is responsible to provide the actual content that needs to be written in the editor + // + // text: the actual current source code in the editor + // message.newContent: the new content in the live preview after the edit operation + const finalText = _syncTextContentChanges(text, message.newContent); editor.replaceRange(finalText, startPos, endPos); - } else { - console.error("Live preview text edit operation failed."); } } From 38080946cea2648d611e69816fa271f195a1c3b7 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 1 Aug 2025 12:55:13 +0530 Subject: [PATCH 076/849] refactor: remove dead code --- .../BrowserScripts/RemoteFunctions.js | 124 +----------------- 1 file changed, 1 insertion(+), 123 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 79e2ba865f..0bb9bf2d25 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -38,12 +38,6 @@ function RemoteFunctions(config) { // we need this so that we can remove click styling from the previous element when a new element is clicked let previouslyClickedElement = null; - var experimental; - if (!config) { - experimental = false; - } else { - experimental = config.experimental; - } var req, timeout; var animateHighlight = function (time) { if(req) { @@ -76,19 +70,6 @@ function RemoteFunctions(config) { } } - // determine the color for a type - function _typeColor(type, highlight) { - switch (type) { - case "html": - return highlight ? "#eec" : "#ffe"; - case "css": - return highlight ? "#cee" : "#eff"; - case "js": - return highlight ? "#ccf" : "#eef"; - default: - return highlight ? "#ddd" : "#eee"; - } - } // compute the screen offset of an element function _screenOffset(element) { @@ -138,87 +119,6 @@ function RemoteFunctions(config) { return element.offsetTop + (element.offsetParent ? getDocumentOffsetTop(element.offsetParent) : 0); } - // construct the info menu - function Menu(element) { - this.element = element; - _trigger(this.element, "showgoto", 1, true); - window.setTimeout(window.remoteShowGoto); - this.remove = this.remove.bind(this); - } - - Menu.prototype = { - onClick: function (url, event) { - event.preventDefault(); - _trigger(this.element, "goto", url, true); - this.remove(); - }, - - createBody: function () { - if (this.body) { - return; - } - - // compute the position on screen - var offset = _screenOffset(this.element), - x = offset.left, - y = offset.top + this.element.offsetHeight; - - // create the container - this.body = window.document.createElement("div"); - this.body.style.setProperty("z-index", 2147483647); - this.body.style.setProperty("position", "absolute"); - this.body.style.setProperty("left", x + "px"); - this.body.style.setProperty("top", y + "px"); - this.body.style.setProperty("font-size", "11pt"); - - // draw the background - this.body.style.setProperty("background", "#fff"); - this.body.style.setProperty("border", "1px solid #888"); - this.body.style.setProperty("-webkit-box-shadow", "2px 2px 6px 0px #ccc"); - this.body.style.setProperty("border-radius", "6px"); - this.body.style.setProperty("padding", "6px"); - }, - - addItem: function (target) { - var item = window.document.createElement("div"); - item.style.setProperty("padding", "2px 6px"); - if (this.body.childNodes.length > 0) { - item.style.setProperty("border-top", "1px solid #ccc"); - } - item.style.setProperty("cursor", "pointer"); - item.style.setProperty("background", _typeColor(target.type)); - item.innerHTML = target.name; - item.addEventListener("click", this.onClick.bind(this, target.url)); - - if (target.file) { - var file = window.document.createElement("i"); - file.style.setProperty("float", "right"); - file.style.setProperty("margin-left", "12px"); - file.innerHTML = " " + target.file; - item.appendChild(file); - } - this.body.appendChild(item); - }, - - show: function () { - if (!this.body) { - this.createBody(); - } - if (!this.body.parentNode) { - window.document.body.appendChild(this.body); - } - window.document.addEventListener("click", this.remove); - }, - - remove: function () { - if (this.body && this.body.parentNode) { - window.document.body.removeChild(this.body); - } - window.document.removeEventListener("click", this.remove); - } - - }; - /** * This function gets called when the delete button is clicked * it sends a message to the editor using postMessage to delete the element from the source code @@ -1354,9 +1254,7 @@ function RemoteFunctions(config) { } }; - var _currentMenu; var _localHighlight; - var _remoteHighlight; var _hoverHighlight; var _clickHighlight; var _nodeInfoBox; @@ -1541,25 +1439,9 @@ function RemoteFunctions(config) { /** Public Commands **********************************************************/ - // show goto - function showGoto(targets) { - if (!_currentMenu) { - return; - } - _currentMenu.createBody(); - var i; - for (i in targets) { - _currentMenu.addItem(targets[i]); - } - _currentMenu.show(); - } // remove active highlights function hideHighlight() { - if (_remoteHighlight) { - _remoteHighlight.clear(); - _remoteHighlight = null; - } if (_clickHighlight) { _clickHighlight.clear(); _clickHighlight = null; @@ -1610,9 +1492,6 @@ function RemoteFunctions(config) { // redraw active highlights function redrawHighlights() { - if (_remoteHighlight) { - _remoteHighlight.redraw(); - } if (_clickHighlight) { _clickHighlight.redraw(); } @@ -1637,7 +1516,7 @@ function RemoteFunctions(config) { if (e.target === window.document) { redrawHighlights(); } else { - if (_remoteHighlight || _localHighlight || _clickHighlight || _hoverHighlight) { + if (_localHighlight || _clickHighlight || _hoverHighlight) { window.setTimeout(redrawHighlights, 0); } } @@ -2082,7 +1961,6 @@ function RemoteFunctions(config) { return { "DOMEditHandler" : DOMEditHandler, - "showGoto" : showGoto, "hideHighlight" : hideHighlight, "highlight" : highlight, "highlightRule" : highlightRule, From 36a0fdd7c8bde395f4b629bad6d93ddd7ce17bd6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 1 Aug 2025 13:35:33 +0530 Subject: [PATCH 077/849] fix: operations doesn't work for empty tags as we were relying on the end tag --- src/LiveDevelopment/LivePreviewEdit.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index fa2846d453..236566da81 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -152,7 +152,8 @@ define(function (require, exports, module) { } const startPos = startRange.from; - const endPos = endRange.close.to; + // for empty tags endRange.close might not exist, for ex: img tag + const endPos = endRange.close ? endRange.close.to : endRange.open.to; const text = editor.getTextBetween(startPos, endPos); @@ -205,7 +206,8 @@ define(function (require, exports, module) { } const startPos = startRange.from; - const endPos = endRange.close.to; + // for empty tags endRange.close might not exist, for ex: img tag + const endPos = endRange.close ? endRange.close.to : endRange.open.to; // this is the actual source code for the element that we need to duplicate const text = editor.getTextBetween(startPos, endPos); @@ -265,7 +267,8 @@ define(function (require, exports, module) { } const startPos = startRange.from; - const endPos = endRange.close.to; + // for empty tags endRange.close might not exist, for ex: img tag + const endPos = endRange.close ? endRange.close.to : endRange.open.to; editor.document.batchOperation(function () { editor.replaceRange("", startPos, endPos); @@ -385,12 +388,12 @@ define(function (require, exports, module) { const sourceRange = { from: sourceStartRange.from, - to: sourceEndRange.close.to + to: sourceEndRange.close ? sourceEndRange.close.to : sourceEndRange.open.to }; const targetRange = { from: targetStartRange.from, - to: targetEndRange.close.to + to: targetEndRange.close ? targetEndRange.close.to : targetEndRange.open.to }; const sourceText = editor.getTextBetween(sourceRange.from, sourceRange.to); @@ -430,7 +433,9 @@ define(function (require, exports, module) { if (updatedSourceEndRange) { const updatedSourceRange = { from: updatedSourceStartRange.from, - to: updatedSourceEndRange.close.to + to: updatedSourceEndRange.close + ? updatedSourceEndRange.close.to + : updatedSourceEndRange.open.to }; editor.replaceRange("", updatedSourceRange.from, updatedSourceRange.to); _cleanupAfterRemoval(editor, updatedSourceRange); @@ -461,7 +466,7 @@ define(function (require, exports, module) { const updatedTargetRange = { from: updatedTargetStartRange.from, - to: updatedTargetEndRange.close.to + to: updatedTargetEndRange.close ? updatedTargetEndRange.close.to : updatedTargetEndRange.open.to }; if (insertAfter) { From 943f651bc5e3e5f50d23c10ecf8471a348764a93 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 1 Aug 2025 19:29:48 +0530 Subject: [PATCH 078/849] refactor: allow buttons to be editable --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 0bb9bf2d25..583b15d299 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -501,7 +501,6 @@ function RemoteFunctions(config) { "audio", "iframe", "object", - "button", "select", "textarea" ]; From e67fd2d4565026870789d5d5a29b28c9824bfcb6 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 2 Aug 2025 12:32:42 +0530 Subject: [PATCH 079/849] fix: text formatting not working when trying to edit text in live preview --- src/LiveDevelopment/LivePreviewEdit.js | 130 +++++++++++-------------- 1 file changed, 56 insertions(+), 74 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 236566da81..100bd2fb6c 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -4,112 +4,94 @@ define(function (require, exports, module) { const CodeMirror = require("thirdparty/CodeMirror/lib/codemirror"); /** - * This function is to sync text content changes between the original source code - * and the live preview DOM after a text edit operation + * This function syncs text content changes between the original source code + * and the live preview DOM after a text edit in the browser * + * @private * @param {String} oldContent - the original source code from the editor - * @param {String} newContent - the DOM element's outerHTML after editing in live preview - * @returns {String} - the updated content that should replace the original code in the editor + * @param {String} newContent - the outerHTML after editing in live preview + * @returns {String} - the updated content that should replace the original editor code * - * NOTE: This function is a bit complex to read, read this jsdoc to understand the flow: + * NOTE: We don’t touch tag names or attributes — + * we only care about text changes or things like newlines,
, or formatting like , , etc. * - * First, we parse both the old and new content using DOMParser to get proper HTML DOM structures - * Then we compare each element and text node between the old and new content + * Here's the basic idea: + * - Parse both old and new HTML strings into DOM trees + * - Then walk both DOMs side by side and sync changes * - * the main goal is that we ONLY want to update text content, and not element nodes or their attributes - * because if we allow element/attribute changes, the browser might try to fix the HTML - * to make it syntactically correct or to make it efficient, which would mess up the user's original code - * We don't want that - we need to respect how the user wrote their code - * For example: if user wrote
- * The browser sees this is invalid CSS and would remove the color attribute entirely - * We want to keep that invalid code as it is because it's what the user wanted to do + * What we handle: + * - if both are text nodes → update the text if changed + * - if both are elements with same tag → go deeper and sync their children + * - if one is text and one is an element → replace (like when user adds/removes
or adds bold/italic) + * - if a node got added or removed → do that in the old DOM * - * Here's how the comparison works: - * - if both nodes are text: update the old text with the new text - * - if both nodes are elements: we recursively check their children (for nested content) - * - if old is text, new is element: replace text with element (like when user adds
) - * - if old is element, new is text: replace element with text (like when user removes
) - * note: when adding new elements (like
tags), we only copy the tag name and content, - * never the attributes, to avoid internal Phoenix properties leaking into user's code + * We don’t recreate or touch existing elements unless absolutely needed, + * so all original user-written attributes and tag structure stay exactly the same. + * + * This avoids the browser trying to “fix” broken HTML (which we don’t want) */ function _syncTextContentChanges(oldContent, newContent) { const parser = new DOMParser(); const oldDoc = parser.parseFromString(oldContent, "text/html"); const newDoc = parser.parseFromString(newContent, "text/html"); - // as DOM parser will add the complete html structure with the HTML tags and all, - // so we just need to get the main content const oldRoot = oldDoc.body; const newRoot = newDoc.body; - // here oldNode and newNode are full HTML elements which are direct children of the body tag function syncText(oldNode, newNode) { if (!oldNode || !newNode) { return; } - // if both the oldNode and newNode has text, replace the old node's text content with the new one + // when both are text nodes, we just need to replace the old text with the new one if (oldNode.nodeType === Node.TEXT_NODE && newNode.nodeType === Node.TEXT_NODE) { - oldNode.nodeValue = newNode.nodeValue; - - } else if ( - // if both have element node, then we recursively get their child elements - // this is so that we can get & update the text content in deeply nested DOM - oldNode.nodeType === Node.ELEMENT_NODE && - newNode.nodeType === Node.ELEMENT_NODE - ) { + if (oldNode.nodeValue !== newNode.nodeValue) { + oldNode.nodeValue = newNode.nodeValue; + } + return; + } - const oldChildren = oldNode.childNodes; - const newChildren = newNode.childNodes; + // when both are elements + if (oldNode.nodeType === Node.ELEMENT_NODE && newNode.nodeType === Node.ELEMENT_NODE) { + const oldChildren = Array.from(oldNode.childNodes); + const newChildren = Array.from(newNode.childNodes); - const minLength = Math.min(oldChildren.length, newChildren.length); + const maxLen = Math.max(oldChildren.length, newChildren.length); - for (let i = 0; i < minLength; i++) { - syncText(oldChildren[i], newChildren[i]); - } - - // append if there are any new nodes, this is mainly when
tags needs to be inserted - // as user pressed shift + enter to create empty lines in the new content - for (let i = minLength; i < newChildren.length; i++) { + for (let i = 0; i < maxLen; i++) { + const oldChild = oldChildren[i]; const newChild = newChildren[i]; - let cleanChild; - if (newChild.nodeType === Node.ELEMENT_NODE) { - // only the element name and not its attributes - // this is to prevent internal properties like data-brackets-id, etc to appear in users code - cleanChild = document.createElement(newChild.tagName); - cleanChild.innerHTML = newChild.innerHTML; + if (!oldChild && newChild) { + // if new child added → clone and insert + oldNode.appendChild(newChild.cloneNode(true)); + } else if (oldChild && !newChild) { + // if child removed → delete + oldNode.removeChild(oldChild); + } else if ( + oldChild.nodeType === newChild.nodeType && + oldChild.nodeType === Node.ELEMENT_NODE && + oldChild.tagName === newChild.tagName + ) { + // same element tag → sync recursively + syncText(oldChild, newChild); + } else if ( + oldChild.nodeType === Node.TEXT_NODE && + newChild.nodeType === Node.TEXT_NODE + ) { + if (oldChild.nodeValue !== newChild.nodeValue) { + oldChild.nodeValue = newChild.nodeValue; + } } else { - // for text nodes, comment nodes, etc. clone normally - cleanChild = newChild.cloneNode(true); + // different node types or tags → replace + oldNode.replaceChild(newChild.cloneNode(true), oldChild); } - - oldNode.appendChild(cleanChild); } - - // remove extra old nodes (maybe extra
's were removed) - for (let i = oldChildren.length - 1; i >= newChildren.length; i--) { - oldNode.removeChild(oldChildren[i]); - } - - } else if (oldNode.nodeType === Node.TEXT_NODE && newNode.nodeType === Node.ELEMENT_NODE) { - // when old has text node and new has element node - // this generally happens when we remove the complete content which results in empty
tag - // for ex:
hello
, here if we remove the 'hello' from live preview then result will be - //

- const replacement = document.createElement(newNode.tagName); - replacement.innerHTML = newNode.innerHTML; - oldNode.parentNode.replaceChild(replacement, oldNode); - } else if (oldNode.nodeType === Node.ELEMENT_NODE && newNode.nodeType === Node.TEXT_NODE) { - // this is opposite of previous one when earlier it was just
or some tag - // and now we add text content in that - const replacement = document.createTextNode(newNode.nodeValue); - oldNode.parentNode.replaceChild(replacement, oldNode); } } - const oldEls = oldRoot.children; - const newEls = newRoot.children; + const oldEls = Array.from(oldRoot.children); + const newEls = Array.from(newRoot.children); for (let i = 0; i < Math.min(oldEls.length, newEls.length); i++) { syncText(oldEls[i], newEls[i]); From cd61d01de8207a97af3f59f2e5c343c744e20715 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 2 Aug 2025 14:14:52 +0530 Subject: [PATCH 080/849] fix: body tag gets removed from source code when trying to edit a body tag directly --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 583b15d299..bcd9f71ec6 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1867,7 +1867,10 @@ function RemoteFunctions(config) { // Function to handle direct editing of elements in the live preview function startEditing(element) { - if (!element) { + if (!element + || element.tagName === "BODY" + || element.tagName === "HTML" + || !element.hasAttribute("data-brackets-id")) { return; } From d099ba2063c96dd85990493f17dc379ac987d5ab Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 2 Aug 2025 15:13:26 +0530 Subject: [PATCH 081/849] refactor: calculate the position of the boxes --- .../BrowserScripts/RemoteFunctions.js | 190 +++++------------- 1 file changed, 49 insertions(+), 141 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index bcd9f71ec6..7399d1e892 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -64,10 +64,9 @@ function RemoteFunctions(config) { if (window.navigator.platform.substr(0, 3) === "Mac") { // Mac return event.metaKey; - } else { - // Windows - return event.ctrlKey; } + // Windows + return event.ctrlKey; } @@ -567,6 +566,20 @@ function RemoteFunctions(config) { }); }, + // note: this box width is the width of the more options box + // we need this as the value is not consistent, it depends on the number of options we show in the box + _getBoxPosition: function(boxWidth) { + const elemBounds = this.element.getBoundingClientRect(); + + const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; + const scrollTop = window.pageYOffset || document.documentElement.scrollTop; + + let topPos = elemBounds.top - 30 + scrollTop; + let leftPos = elemBounds.right - boxWidth + scrollLeft; + + return {topPos: topPos, leftPos: leftPos}; + }, + _style: function() { this.body = window.document.createElement("div"); @@ -575,9 +588,6 @@ function RemoteFunctions(config) { // {mode: "closed"} means that users will not be able to access the shadow DOM const shadow = this.body.attachShadow({ mode: "closed" }); - // the element that was clicked - let elemBounds = this.element.getBoundingClientRect(); - // check which options should be shown to determine box width const showEditTextOption = _shouldShowEditTextOption(this.element); const showSelectParentOption = _shouldShowSelectParentOption(this.element); @@ -601,43 +611,6 @@ function RemoteFunctions(config) { } else { boxWidth = 106; } - const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; - const scrollTop = window.pageYOffset || document.documentElement.scrollTop; - - // get the ID and classes for the element - // we need this to check for overlap issue between the info box and this box - // because when we have classes and ids then the info box tends to stretch in width - const id = this.element.id; - const classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; - const tagName = this.element.tagName.toLowerCase(); - - const isOverlap = checkOverlap(elemBounds.width, tagName, id, classes); - - const viewportWidth = window.innerWidth; - const idealLeftPos = elemBounds.right - boxWidth + scrollLeft; - const maxLeftPos = viewportWidth - boxWidth - 10 + scrollLeft; - // 10px is just the padding, because we want some space - const minLeftPos = 10 + scrollLeft; - - // we'll use the position that keeps the box within viewport bounds - let leftPos = Math.min(idealLeftPos, maxLeftPos); - leftPos = Math.max(leftPos, minLeftPos); - let topPos; - - if (isOverlap) { - if (elemBounds.top > 40) { // check if there's enough space at the top - // place at the top - topPos = elemBounds.top - 30 + scrollTop; - } else { - // at the bottom - topPos = elemBounds.top + elemBounds.height + 5 + scrollTop; - } - } else { - // no overlap, so it comes just above the element - topPos = (elemBounds.top - 30 < 0 - ? elemBounds.top + elemBounds.height + 5 - : elemBounds.top - 30) + scrollTop; - } // the icons that is displayed in the box const ICONS = { @@ -693,6 +666,8 @@ function RemoteFunctions(config) {
`; + const boxPos = this._getBoxPosition(boxWidth); + const styles = ` .box { background-color: #4285F4; @@ -704,8 +679,8 @@ function RemoteFunctions(config) { font-family: Arial, sans-serif; z-index: 2147483647; position: absolute; - left: ${leftPos}px; - top: ${topPos}px; + left: ${boxPos.leftPos}px; + top: ${boxPos.topPos}px; width: ${boxWidth}px; box-sizing: border-box; } @@ -774,6 +749,32 @@ function RemoteFunctions(config) { } NodeInfoBox.prototype = { + _calcHeight: function() { + const element = this.element; + + let baseHeight = 26.75; + if(element.id) { + baseHeight += 17.25; + } + if(element.className.length !== 0) { + baseHeight += 17.25; + } + + return baseHeight; + }, + + _getBoxPosition: function() { + const elemBounds = this.element.getBoundingClientRect(); + + const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; + const scrollTop = window.pageYOffset || document.documentElement.scrollTop; + + let topPos = elemBounds.top - this._calcHeight() + scrollTop; + let leftPos = elemBounds.left + scrollLeft; + + return {topPos: topPos, leftPos: leftPos}; + }, + _style: function() { this.body = window.document.createElement("div"); @@ -782,18 +783,6 @@ function RemoteFunctions(config) { // {mode: "closed"} means that users will not be able to access the shadow DOM const shadow = this.body.attachShadow({ mode: "closed" }); - // the element that was clicked - let elemBounds = this.element.getBoundingClientRect(); - - // the positions where it should be placed - const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; - const scrollTop = window.pageYOffset || document.documentElement.scrollTop; - - // this value decides where we need to show the box in the UI - // we are creating this here, because if the element has IDs and Classes then we need to increase the value - // so that the box doesn't obscure the element - let pushBoxUp = 32; // px value - // get the ID and classes for that element, as we need to display it in the box const id = this.element.id; const classes = this.element.className ? this.element.className.split(/\s+/).filter(Boolean) : []; @@ -804,7 +793,6 @@ function RemoteFunctions(config) { // Add ID if present if (id) { content += "
#" + id + "
"; - pushBoxUp += 20; } // Add classes (limit to 3 with dropdown indicator) @@ -817,89 +805,9 @@ function RemoteFunctions(config) { content += "+" + (classes.length - 3) + " more"; } content += "
"; - pushBoxUp += 20; } - let leftPos = elemBounds.left + scrollLeft; - let topPos = (elemBounds.top - pushBoxUp < 0 - ? elemBounds.top + elemBounds.height + 5 - : elemBounds.top - pushBoxUp) + scrollTop; - - let avgCharWidth = 6; - const basePadding = 16; - - // Get the tag name - const tagName = this.element.tagName.toLowerCase(); - - // Count characters in tag name, id, and classes - let charCount = _calculateInfoBoxCharCount(tagName, id, classes); - if(charCount <= 10) { - avgCharWidth = 7.5; - } - - // Calculate estimated width based on character count - // Formula: base padding + (character count * average character width) - const boxWidth = basePadding + (charCount * avgCharWidth); - - // we need to check for overlap if this is from a click - if (this.isFromClick) { - const isOverlap = checkOverlap(elemBounds.width, tagName, id, classes); - - if (isOverlap) { - const windowWidth = window.innerWidth; - const viewportHeight = window.innerHeight; - - // Estimate the height of the info box based on its content - // base height for tag name + padding - let estimatedHeight = 32; - - // height adjustment if ID is present - if (id) { - estimatedHeight += 20; - } - - // height adjustment if classes are present - if (classes.length > 0) { - estimatedHeight += 20; - } - - // check if element is near bottom of viewport - const elementBottomFromViewportTop = elemBounds.bottom; - const availableSpaceBelow = viewportHeight - elementBottomFromViewportTop; - - // align with the bottom of the info box (original behavior) - topPos = (elemBounds.top + elemBounds.height - estimatedHeight) + scrollTop; - - // If element is near bottom and there's not enough space below, - // push the info box up a bit to prevent scrollbar - if (availableSpaceBelow < estimatedHeight + 10) { - // Push it up by the amount it would overflow - const pushUpAmount = estimatedHeight - availableSpaceBelow; - topPos -= pushUpAmount; - } - - // decide whether position at left or right based on available space - // check if there's enough space on the left side - if (elemBounds.left > boxWidth + 10) { - leftPos = elemBounds.left - boxWidth - 10 + scrollLeft; - } else if (windowWidth - elemBounds.right > boxWidth + 10) { - // position on the right - leftPos = elemBounds.right + 10 + scrollLeft; - } - } - } - - // to make sure that the info box stays under the viewport width - const viewportWidth = window.innerWidth; - const margin = 10; - - // horizontal boundary checking - if (leftPos + boxWidth + margin > viewportWidth + scrollLeft) { - leftPos = viewportWidth + scrollLeft - boxWidth - margin; - } - if (leftPos < scrollLeft + margin) { - leftPos = scrollLeft + margin; - } + const boxPos = this._getBoxPosition(); const styles = ` .box { @@ -912,8 +820,8 @@ function RemoteFunctions(config) { font-family: Arial, sans-serif; z-index: 2147483647; position: absolute; - left: ${leftPos}px; - top: ${topPos}px; + left: ${boxPos.leftPos}px; + top: ${boxPos.topPos}px; max-width: fit-content; box-sizing: border-box; pointer-events: none; From 964d62f87f9b8bfe8d885f8daf42fb0612f3acf1 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 2 Aug 2025 20:12:04 +0530 Subject: [PATCH 082/849] fix: move boxes to down when no space at top --- .../BrowserScripts/RemoteFunctions.js | 77 +++---------------- 1 file changed, 11 insertions(+), 66 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 7399d1e892..1615368ce5 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -394,71 +394,6 @@ function RemoteFunctions(config) { delete window._currentDraggedElement; } - /** - * This function is to calculate the width of the info box based on the number of chars in the box - * @param {String} tagName - the element's tag name - * @param {String} id - the element's id - * @param {Array} classes - the array of class names - * @returns {Number} - the total char count - */ - function _calculateInfoBoxCharCount(tagName, id, classes) { - // char count for tag name - let tagNameCharCount = tagName.length; - let idNameCharCount = 0; - let classNameCharCount = 0; - // char count for id - if (id) { - idNameCharCount = id.length + 1; // +1 for # - } - - // char count for classes - if (classes.length > 0) { - for (let i = 0; i < Math.min(classes.length, 3); i++) { - classNameCharCount += classes[i].length + 1; // +1 for . - } - - if (classes.length > 3) { - // "+ X more" for more than 3 classes - const moreText = `+${classes.length - 3} more`; - classNameCharCount += moreText.length; - } - } - return Math.max(tagNameCharCount, idNameCharCount, classNameCharCount); - } - - /** - * This function checks whether there is overlap between the info and the more options box - * @param {Number} elemWidth - the width of the DOM element - * @param {String} tagName - the element's tag name - * @param {String} id - the element's id - * @param {Array} classes - the array of class names - * @returns {Number} - the total char count - */ - function checkOverlap(elemWidth, tagName, id, classes) { - let avgCharWidth = 6; - const basePadding = 16; - - // char count for tag name, id, and classes - let charCount = _calculateInfoBoxCharCount(tagName, id, classes); - if(charCount <= 10) { - avgCharWidth = 7.5; - } - - // calc estimate width based on the char count - const infoBoxWidth = basePadding + (charCount * avgCharWidth); - - // more options box is 106px - const moreOptionsBoxWidth = 106; - - // check if there's enough space for both boxes - // 20px buffer for spacing between boxes - if (elemWidth > (infoBoxWidth + moreOptionsBoxWidth + 20)) { - return false; // No overlap - } - - return true; - } - /** * this function is to check if an element should show the edit text option * it is needed because edit text option doesn't make sense with many elements like images, videos, hr tag etc @@ -577,6 +512,10 @@ function RemoteFunctions(config) { let topPos = elemBounds.top - 30 + scrollTop; let leftPos = elemBounds.right - boxWidth + scrollLeft; + if (elemBounds.top - 30 < 0) { + topPos = elemBounds.top + elemBounds.height + 5 + scrollTop; + } + return {topPos: topPos, leftPos: leftPos}; }, @@ -769,9 +708,15 @@ function RemoteFunctions(config) { const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; const scrollTop = window.pageYOffset || document.documentElement.scrollTop; - let topPos = elemBounds.top - this._calcHeight() + scrollTop; + const boxHeight = this._calcHeight(); + + let topPos = elemBounds.top - boxHeight + scrollTop; let leftPos = elemBounds.left + scrollLeft; + if (elemBounds.top - boxHeight < 0) { + topPos = elemBounds.top + elemBounds.height + 5 + scrollTop; + } + return {topPos: topPos, leftPos: leftPos}; }, From 1b1ade56334343ae7a54818f2c4fb3ae7b504166 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 13:23:03 +0530 Subject: [PATCH 083/849] feat: update background color when a option button is hovered --- .../BrowserScripts/RemoteFunctions.js | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 1615368ce5..a249ec24b8 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -544,11 +544,11 @@ function RemoteFunctions(config) { // box width we need to decide based on the no. of options let boxWidth; if (optionCount === 2) { - boxWidth = 52; + boxWidth = 48; } else if (optionCount === 3) { - boxWidth = 82; + boxWidth = 72; } else { - boxWidth = 106; + boxWidth = 96; } // the icons that is displayed in the box @@ -612,7 +612,6 @@ function RemoteFunctions(config) { background-color: #4285F4; color: white; border-radius: 3px; - padding: 5px 8px; box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); font-size: 12px; font-family: Arial, sans-serif; @@ -626,14 +625,27 @@ function RemoteFunctions(config) { .node-options { display: flex; - gap: 8px; align-items: center; } .node-options span { + padding: 4px 3.9px; cursor: pointer; display: flex; align-items: center; + border-radius: 0; + } + + .node-options span:first-child { + border-radius: 3px 0 0 3px; + } + + .node-options span:last-child { + border-radius: 0 3px 3px 0; + } + + .node-options span:hover { + background-color: rgba(255, 255, 255, 0.15); } .node-options span > svg { From b3bc4d11079db890231112d374c8ad19675893cb Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 14:49:09 +0530 Subject: [PATCH 084/849] fix: positioning of the info box --- .../BrowserScripts/RemoteFunctions.js | 72 +++++++++---------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index a249ec24b8..eac56c0b51 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -505,15 +505,13 @@ function RemoteFunctions(config) { // we need this as the value is not consistent, it depends on the number of options we show in the box _getBoxPosition: function(boxWidth) { const elemBounds = this.element.getBoundingClientRect(); + const offset = _screenOffset(this.element); - const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; - const scrollTop = window.pageYOffset || document.documentElement.scrollTop; + let topPos = offset.top - 30; + let leftPos = offset.left + elemBounds.width - boxWidth; - let topPos = elemBounds.top - 30 + scrollTop; - let leftPos = elemBounds.right - boxWidth + scrollLeft; - - if (elemBounds.top - 30 < 0) { - topPos = elemBounds.top + elemBounds.height + 5 + scrollTop; + if (offset.top - 30 < 0) { + topPos = offset.top + elemBounds.height + 5; } return {topPos: topPos, leftPos: leftPos}; @@ -700,33 +698,15 @@ function RemoteFunctions(config) { } NodeInfoBox.prototype = { - _calcHeight: function() { - const element = this.element; - - let baseHeight = 26.75; - if(element.id) { - baseHeight += 17.25; - } - if(element.className.length !== 0) { - baseHeight += 17.25; - } - - return baseHeight; - }, - - _getBoxPosition: function() { + _getBoxPosition: function(boxHeight) { const elemBounds = this.element.getBoundingClientRect(); + const offset = _screenOffset(this.element); - const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft; - const scrollTop = window.pageYOffset || document.documentElement.scrollTop; - - const boxHeight = this._calcHeight(); - - let topPos = elemBounds.top - boxHeight + scrollTop; - let leftPos = elemBounds.left + scrollLeft; + let topPos = offset.top - boxHeight - 6; // 6 for just some little space to breathes + let leftPos = offset.left; - if (elemBounds.top - boxHeight < 0) { - topPos = elemBounds.top + elemBounds.height + 5 + scrollTop; + if (offset.top - boxHeight < 0) { + topPos = offset.top + elemBounds.height + 6; } return {topPos: topPos, leftPos: leftPos}; @@ -737,8 +717,8 @@ function RemoteFunctions(config) { // this is shadow DOM. // we need it because if we add the box directly to the DOM then users style might override it. - // {mode: "closed"} means that users will not be able to access the shadow DOM - const shadow = this.body.attachShadow({ mode: "closed" }); + // {mode: "open"} allows us to access the shadow DOM to get actual height/position of the boxes + const shadow = this.body.attachShadow({ mode: "open" }); // get the ID and classes for that element, as we need to display it in the box const id = this.element.id; @@ -764,10 +744,14 @@ function RemoteFunctions(config) { content += "
"; } - const boxPos = this._getBoxPosition(); + // initially, we place our info box -1000px to the top but at the right left pos. this is done so that + // we can take the text-wrapping inside the info box in account when calculating the height + // after calculating the height of the box, we place it at the exact position above the element + const offset = _screenOffset(this.element); + const leftPos = offset.left; const styles = ` - .box { + .phoenix-node-info-box { background-color: #4285F4; color: white; border-radius: 3px; @@ -777,9 +761,9 @@ function RemoteFunctions(config) { font-family: Arial, sans-serif; z-index: 2147483647; position: absolute; - left: ${boxPos.leftPos}px; - top: ${boxPos.topPos}px; - max-width: fit-content; + left: ${leftPos}px; + top: -1000px; + max-width: 300px; box-sizing: border-box; pointer-events: none; } @@ -799,7 +783,7 @@ function RemoteFunctions(config) { `; // add everything to the shadow box - shadow.innerHTML = `
${content}
`; + shadow.innerHTML = `
${content}
`; this._shadow = shadow; }, @@ -808,6 +792,16 @@ function RemoteFunctions(config) { this._style(); // style the box window.document.body.appendChild(this.body); + + // get the actual rendered height of the box and then we reposition it to the actual place + const boxElement = this._shadow.querySelector('.phoenix-node-info-box'); + if (boxElement) { + const nodeInfoBoxHeight = boxElement.getBoundingClientRect().height; + const pos = this._getBoxPosition(nodeInfoBoxHeight); + + boxElement.style.left = pos.leftPos + 'px'; + boxElement.style.top = pos.topPos + 'px'; + } }, remove: function() { From 31a9f7bb75f44edef2608c13b6887778b698eb69 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 16:01:11 +0530 Subject: [PATCH 085/849] fix: node more options box positioning --- .../BrowserScripts/RemoteFunctions.js | 55 +++++++------------ 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index eac56c0b51..c7d9a557fc 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -501,17 +501,15 @@ function RemoteFunctions(config) { }); }, - // note: this box width is the width of the more options box - // we need this as the value is not consistent, it depends on the number of options we show in the box - _getBoxPosition: function(boxWidth) { + _getBoxPosition: function(boxWidth, boxHeight) { const elemBounds = this.element.getBoundingClientRect(); const offset = _screenOffset(this.element); - let topPos = offset.top - 30; + let topPos = offset.top - boxHeight - 6; // 6 for just some little space to breathe let leftPos = offset.left + elemBounds.width - boxWidth; - if (offset.top - 30 < 0) { - topPos = offset.top + elemBounds.height + 5; + if (offset.top - boxHeight < 0) { + topPos = offset.top + elemBounds.height + 6; } return {topPos: topPos, leftPos: leftPos}; @@ -522,33 +520,13 @@ function RemoteFunctions(config) { // this is shadow DOM. // we need it because if we add the box directly to the DOM then users style might override it. - // {mode: "closed"} means that users will not be able to access the shadow DOM - const shadow = this.body.attachShadow({ mode: "closed" }); + // {mode: "open"} allows us to access the shadow DOM to get actual height/position of the boxes + const shadow = this.body.attachShadow({ mode: "open" }); // check which options should be shown to determine box width const showEditTextOption = _shouldShowEditTextOption(this.element); const showSelectParentOption = _shouldShowSelectParentOption(this.element); - // calculate box width based on visible options - // NOTE: duplicate and delete buttons are always shown - let optionCount = 2; - if (showSelectParentOption) { - optionCount++; - } - if (showEditTextOption) { - optionCount++; - } - - // box width we need to decide based on the no. of options - let boxWidth; - if (optionCount === 2) { - boxWidth = 48; - } else if (optionCount === 3) { - boxWidth = 72; - } else { - boxWidth = 96; - } - // the icons that is displayed in the box const ICONS = { arrowUp: ` @@ -603,10 +581,8 @@ function RemoteFunctions(config) {
`; - const boxPos = this._getBoxPosition(boxWidth); - const styles = ` - .box { + .phoenix-more-options-box { background-color: #4285F4; color: white; border-radius: 3px; @@ -615,9 +591,8 @@ function RemoteFunctions(config) { font-family: Arial, sans-serif; z-index: 2147483647; position: absolute; - left: ${boxPos.leftPos}px; - top: ${boxPos.topPos}px; - width: ${boxWidth}px; + left: -1000px; + top: -1000px; box-sizing: border-box; } @@ -654,7 +629,7 @@ function RemoteFunctions(config) { `; // add everything to the shadow box - shadow.innerHTML = `
${content}
`; + shadow.innerHTML = `
${content}
`; this._shadow = shadow; }, @@ -664,6 +639,16 @@ function RemoteFunctions(config) { window.document.body.appendChild(this.body); + // get the actual rendered dimensions of the box and then we reposition it to the actual place + const boxElement = this._shadow.querySelector('.phoenix-more-options-box'); + if (boxElement) { + const boxRect = boxElement.getBoundingClientRect(); + const pos = this._getBoxPosition(boxRect.width, boxRect.height); + + boxElement.style.left = pos.leftPos + 'px'; + boxElement.style.top = pos.topPos + 'px'; + } + // add click handler to all the buttons const spans = this._shadow.querySelectorAll('.node-options span'); spans.forEach(span => { From 7e4508d0f20a350c752bd6177f0718a036b5ac92 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 17:31:59 +0530 Subject: [PATCH 086/849] fix: boxes overlapping each other --- .../BrowserScripts/RemoteFunctions.js | 68 ++++++++++++++++--- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index c7d9a557fc..5682643833 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -683,15 +683,51 @@ function RemoteFunctions(config) { } NodeInfoBox.prototype = { - _getBoxPosition: function(boxHeight) { + _checkOverlap: function(nodeInfoBoxPos, nodeInfoBoxDimensions) { + if (_nodeMoreOptionsBox && _nodeMoreOptionsBox._shadow) { + const moreOptionsBoxElement = _nodeMoreOptionsBox._shadow.querySelector('.phoenix-more-options-box'); + if (moreOptionsBoxElement) { + const moreOptionsBoxRect = moreOptionsBoxElement.getBoundingClientRect(); + + const infoBox = { + left: nodeInfoBoxPos.leftPos, + top: nodeInfoBoxPos.topPos, + right: nodeInfoBoxPos.leftPos + nodeInfoBoxDimensions.width, + bottom: nodeInfoBoxPos.topPos + nodeInfoBoxDimensions.height + }; + + const moreOptionsBox = { + left: moreOptionsBoxRect.left, + top: moreOptionsBoxRect.top, + right: moreOptionsBoxRect.right, + bottom: moreOptionsBoxRect.bottom + }; + + return !(infoBox.right < moreOptionsBox.left || + moreOptionsBox.right < infoBox.left || + infoBox.bottom < moreOptionsBox.top || + moreOptionsBox.bottom < infoBox.top); + } + } + return false; + }, + + _getBoxPosition: function(boxHeight, overlap = false) { const elemBounds = this.element.getBoundingClientRect(); const offset = _screenOffset(this.element); + let topPos = 0; + let leftPos = 0; - let topPos = offset.top - boxHeight - 6; // 6 for just some little space to breathes - let leftPos = offset.left; + if (overlap) { + topPos = offset.top + 2; + leftPos = offset.left + elemBounds.width + 6; + } else { + topPos = offset.top - boxHeight - 6; // 6 for just some little space to breathes + leftPos = offset.left; - if (offset.top - boxHeight < 0) { - topPos = offset.top + elemBounds.height + 6; + if (offset.top - boxHeight < 0) { + topPos = offset.top + elemBounds.height + 6; + } } return {topPos: topPos, leftPos: leftPos}; @@ -781,11 +817,23 @@ function RemoteFunctions(config) { // get the actual rendered height of the box and then we reposition it to the actual place const boxElement = this._shadow.querySelector('.phoenix-node-info-box'); if (boxElement) { - const nodeInfoBoxHeight = boxElement.getBoundingClientRect().height; - const pos = this._getBoxPosition(nodeInfoBoxHeight); - - boxElement.style.left = pos.leftPos + 'px'; - boxElement.style.top = pos.topPos + 'px'; + const nodeInfoBoxDimensions = { + height: boxElement.getBoundingClientRect().height, + width: boxElement.getBoundingClientRect().width + }; + const nodeInfoBoxPos = this._getBoxPosition(nodeInfoBoxDimensions.height); + + boxElement.style.left = nodeInfoBoxPos.leftPos + 'px'; + boxElement.style.top = nodeInfoBoxPos.topPos + 'px'; + + if(this.isFromClick) { + const isBoxOverlapping = this._checkOverlap(nodeInfoBoxPos, nodeInfoBoxDimensions); + if(isBoxOverlapping) { + const newPos = this._getBoxPosition(nodeInfoBoxDimensions.height, true); + boxElement.style.left = newPos.leftPos + 'px'; + boxElement.style.top = newPos.topPos + 'px'; + } + } } }, From 896028586414ea62c80c1e586fcb9f7a12b2bb77 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 18:00:57 +0530 Subject: [PATCH 087/849] fix: use screenOffset to calculate overflow --- .../BrowserScripts/RemoteFunctions.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 5682643833..cdc519128b 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -687,6 +687,7 @@ function RemoteFunctions(config) { if (_nodeMoreOptionsBox && _nodeMoreOptionsBox._shadow) { const moreOptionsBoxElement = _nodeMoreOptionsBox._shadow.querySelector('.phoenix-more-options-box'); if (moreOptionsBoxElement) { + const moreOptionsBoxOffset = _screenOffset(moreOptionsBoxElement); const moreOptionsBoxRect = moreOptionsBoxElement.getBoundingClientRect(); const infoBox = { @@ -697,16 +698,18 @@ function RemoteFunctions(config) { }; const moreOptionsBox = { - left: moreOptionsBoxRect.left, - top: moreOptionsBoxRect.top, - right: moreOptionsBoxRect.right, - bottom: moreOptionsBoxRect.bottom + left: moreOptionsBoxOffset.left, + top: moreOptionsBoxOffset.top, + right: moreOptionsBoxOffset.left + moreOptionsBoxRect.width, + bottom: moreOptionsBoxOffset.top + moreOptionsBoxRect.height }; - return !(infoBox.right < moreOptionsBox.left || + const isOverlapping = !(infoBox.right < moreOptionsBox.left || moreOptionsBox.right < infoBox.left || infoBox.bottom < moreOptionsBox.top || moreOptionsBox.bottom < infoBox.top); + + return isOverlapping; } } return false; From 6bfc561277afc9cffab5278c1433f589def08d36 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 18:25:59 +0530 Subject: [PATCH 088/849] fix: phoenix internal attributes leaking into users source code --- src/LiveDevelopment/LivePreviewEdit.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 100bd2fb6c..380c97efc2 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -38,6 +38,17 @@ define(function (require, exports, module) { const oldRoot = oldDoc.body; const newRoot = newDoc.body; + // this function is to remove the phoenix internal attributes from leaking into the user's source code + function cleanClonedElement(clonedElement) { + if (clonedElement.nodeType === Node.ELEMENT_NODE) { + clonedElement.removeAttribute("data-brackets-id"); + + const children = clonedElement.querySelectorAll("[data-brackets-id]"); + children.forEach(child => child.removeAttribute("data-brackets-id")); + } + return clonedElement; + } + function syncText(oldNode, newNode) { if (!oldNode || !newNode) { return; @@ -64,7 +75,8 @@ define(function (require, exports, module) { if (!oldChild && newChild) { // if new child added → clone and insert - oldNode.appendChild(newChild.cloneNode(true)); + const cloned = newChild.cloneNode(true); + oldNode.appendChild(cleanClonedElement(cloned)); } else if (oldChild && !newChild) { // if child removed → delete oldNode.removeChild(oldChild); @@ -84,7 +96,8 @@ define(function (require, exports, module) { } } else { // different node types or tags → replace - oldNode.replaceChild(newChild.cloneNode(true), oldChild); + const cloned = newChild.cloneNode(true); + oldNode.replaceChild(cleanClonedElement(cloned), oldChild); } } } From 7c965eeb38ebb23b1ab3da95f8c95819d4a3e5b1 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 18:50:21 +0530 Subject: [PATCH 089/849] fix: boxes gets out of viewport --- .../BrowserScripts/RemoteFunctions.js | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index cdc519128b..a982be7322 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -508,10 +508,16 @@ function RemoteFunctions(config) { let topPos = offset.top - boxHeight - 6; // 6 for just some little space to breathe let leftPos = offset.left + elemBounds.width - boxWidth; + // Check if the box would go off the top of the viewport if (offset.top - boxHeight < 0) { topPos = offset.top + elemBounds.height + 6; } + // Check if the box would go off the left of the viewport + if (leftPos < 0) { + leftPos = offset.left; + } + return {topPos: topPos, leftPos: leftPos}; }, @@ -715,7 +721,7 @@ function RemoteFunctions(config) { return false; }, - _getBoxPosition: function(boxHeight, overlap = false) { + _getBoxPosition: function(boxDimensions, overlap = false) { const elemBounds = this.element.getBoundingClientRect(); const offset = _screenOffset(this.element); let topPos = 0; @@ -724,13 +730,23 @@ function RemoteFunctions(config) { if (overlap) { topPos = offset.top + 2; leftPos = offset.left + elemBounds.width + 6; + + // Check if overlap position would go off the right of the viewport + if (leftPos + boxDimensions.width > window.innerWidth) { + leftPos = offset.left - boxDimensions.width - 6; + } } else { - topPos = offset.top - boxHeight - 6; // 6 for just some little space to breathes + topPos = offset.top - boxDimensions.height - 6; // 6 for just some little space to breathe leftPos = offset.left; - if (offset.top - boxHeight < 0) { + if (offset.top - boxDimensions.height < 0) { topPos = offset.top + elemBounds.height + 6; } + + // Check if the box would go off the right of the viewport + if (leftPos + boxDimensions.width > window.innerWidth) { + leftPos = window.innerWidth - boxDimensions.width - 10; + } } return {topPos: topPos, leftPos: leftPos}; @@ -824,7 +840,7 @@ function RemoteFunctions(config) { height: boxElement.getBoundingClientRect().height, width: boxElement.getBoundingClientRect().width }; - const nodeInfoBoxPos = this._getBoxPosition(nodeInfoBoxDimensions.height); + const nodeInfoBoxPos = this._getBoxPosition(nodeInfoBoxDimensions, false); boxElement.style.left = nodeInfoBoxPos.leftPos + 'px'; boxElement.style.top = nodeInfoBoxPos.topPos + 'px'; @@ -832,7 +848,7 @@ function RemoteFunctions(config) { if(this.isFromClick) { const isBoxOverlapping = this._checkOverlap(nodeInfoBoxPos, nodeInfoBoxDimensions); if(isBoxOverlapping) { - const newPos = this._getBoxPosition(nodeInfoBoxDimensions.height, true); + const newPos = this._getBoxPosition(nodeInfoBoxDimensions, true); boxElement.style.left = newPos.leftPos + 'px'; boxElement.style.top = newPos.topPos + 'px'; } From a1501b11c92f159b0258a32a3381675dfe88f22f Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 3 Aug 2025 23:46:28 +0530 Subject: [PATCH 090/849] feat: disable all the live preview advance features when its disabled --- .../BrowserScripts/RemoteFunctions.js | 81 +++++++++++-------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index a982be7322..d27bf3458d 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -30,9 +30,8 @@ */ function RemoteFunctions(config) { - // this is responsible to make the advanced DOM features active or inactive - // TODO: give this var a better name - let isFlagActive = true; + // this is responsible to make the advanced live preview features active or inactive + let isLPEditFeaturesActive = false; // this will store the element that was clicked previously (before the new click) // we need this so that we can remove click styling from the previous element when a new element is clicked @@ -641,6 +640,11 @@ function RemoteFunctions(config) { create: function() { this.remove(); // remove existing box if already present + + if(!isLPEditFeaturesActive) { + return; + } + this._style(); // style the box window.document.body.appendChild(this.body); @@ -829,6 +833,11 @@ function RemoteFunctions(config) { create: function() { this.remove(); // remove existing box if already present + + if(!isLPEditFeaturesActive) { + return; + } + this._style(); // style the box window.document.body.appendChild(this.body); @@ -1196,7 +1205,7 @@ function RemoteFunctions(config) { } function onElementHover(event) { - if (_hoverHighlight) { + if (_hoverHighlight && isLPEditFeaturesActive) { _hoverHighlight.clear(); // Skip highlighting for HTML and BODY tags and for DOM elements which doesn't have 'data-brackets-id' @@ -1227,24 +1236,24 @@ function RemoteFunctions(config) { } function onElementHoverOut(event) { - if (_hoverHighlight) { + if (_hoverHighlight && isLPEditFeaturesActive) { _hoverHighlight.clear(); - } - // Restore original background color - if (event && event.target && event.target.nodeType === Node.ELEMENT_NODE && event.target.hasAttribute("data-brackets-id")) { - if (event.target._originalBackgroundColor !== undefined) { - event.target.style.backgroundColor = event.target._originalBackgroundColor; - } else { - event.target.style.backgroundColor = ""; + // Restore original background color + if (event && event.target && event.target.nodeType === Node.ELEMENT_NODE && event.target.hasAttribute("data-brackets-id")) { + if (event.target._originalBackgroundColor !== undefined) { + event.target.style.backgroundColor = event.target._originalBackgroundColor; + } else { + event.target.style.backgroundColor = ""; + } + delete event.target._originalBackgroundColor; } - delete event.target._originalBackgroundColor; - } - // Remove info box when mouse leaves the element - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - _nodeInfoBox = null; + // Remove info box when mouse leaves the element + if (_nodeInfoBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = null; + } } } @@ -1256,7 +1265,7 @@ function RemoteFunctions(config) { function onClick(event) { // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' if ( - isFlagActive && + isLPEditFeaturesActive && event.target.hasAttribute("data-brackets-id") && event.target.tagName !== "BODY" && event.target.tagName !== "HTML" @@ -1292,7 +1301,6 @@ function RemoteFunctions(config) { event.target.style.outline = "1px solid #4285F4"; previouslyClickedElement = event.target; } else if ( // when user clicks on the HTML or the BODY tag, we want to remove the boxes - isFlagActive && _nodeMoreOptionsBox && (event.target.tagName === "HTML" || event.target.tagName === "BODY") ) { @@ -1306,7 +1314,7 @@ function RemoteFunctions(config) { */ function onDoubleClick(event) { if ( - isFlagActive && + isLPEditFeaturesActive && event.target.hasAttribute("data-brackets-id") && event.target.tagName !== "BODY" && event.target.tagName !== "HTML" @@ -1778,7 +1786,8 @@ function RemoteFunctions(config) { // Function to handle direct editing of elements in the live preview function startEditing(element) { - if (!element + if (!isLPEditFeaturesActive + || !element || element.tagName === "BODY" || element.tagName === "HTML" || !element.hasAttribute("data-brackets-id")) { @@ -1826,7 +1835,7 @@ function RemoteFunctions(config) { // Function to finish editing and apply changes // isEditSuccessful: this is a boolean value, defaults to true. false only when the edit operation is cancelled function finishEditing(element, isEditSuccessful = true) { - if (!element || !element.hasAttribute("contenteditable")) { + if (!isLPEditFeaturesActive || !element || !element.hasAttribute("contenteditable")) { return; } @@ -1857,20 +1866,22 @@ function RemoteFunctions(config) { // init _editHandler = new DOMEditHandler(window.document); - // Initialize hover highlight with Chrome-like colors - _hoverHighlight = new Highlight("#c8f9c5", true); // Green similar to Chrome's padding color + if (isLPEditFeaturesActive) { + // Initialize hover highlight with Chrome-like colors + _hoverHighlight = new Highlight("#c8f9c5", true); // Green similar to Chrome's padding color + + // Initialize click highlight with animation + _clickHighlight = new Highlight("#cfc", true); // Light green for click highlight - // Initialize click highlight with animation - _clickHighlight = new Highlight("#cfc", true); // Light green for click highlight + window.document.addEventListener("mouseover", onElementHover); + window.document.addEventListener("mouseout", onElementHoverOut); + window.document.addEventListener("click", onClick); + window.document.addEventListener("dblclick", onDoubleClick); + window.document.addEventListener("dragover", onDragOver); + window.document.addEventListener("drop", onDrop); + window.document.addEventListener("keydown", onKeyDown); + } - // Add event listeners for hover - window.document.addEventListener("mouseover", onElementHover); - window.document.addEventListener("mouseout", onElementHoverOut); - window.document.addEventListener("click", onClick); - window.document.addEventListener("dblclick", onDoubleClick); - window.document.addEventListener("dragover", onDragOver); - window.document.addEventListener("drop", onDrop); - window.document.addEventListener("keydown", onKeyDown); return { "DOMEditHandler" : DOMEditHandler, From 2c0130a461bd28c27e1dcbe3d209fdeb21ab32e8 Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 4 Aug 2025 18:33:58 +0530 Subject: [PATCH 091/849] feat: add a setting to show elements highlights on hover or click --- .../BrowserScripts/RemoteFunctions.js | 21 ++++++++----------- src/LiveDevelopment/main.js | 14 ++++++++++++- .../LivePreviewSettings.js | 15 +++++++++++-- .../livePreviewSettings.html | 9 ++++++++ 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index d27bf3458d..9c4199019a 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -30,9 +30,6 @@ */ function RemoteFunctions(config) { - // this is responsible to make the advanced live preview features active or inactive - let isLPEditFeaturesActive = false; - // this will store the element that was clicked previously (before the new click) // we need this so that we can remove click styling from the previous element when a new element is clicked let previouslyClickedElement = null; @@ -641,7 +638,7 @@ function RemoteFunctions(config) { create: function() { this.remove(); // remove existing box if already present - if(!isLPEditFeaturesActive) { + if(!config.isLPEditFeaturesActive) { return; } @@ -834,7 +831,7 @@ function RemoteFunctions(config) { create: function() { this.remove(); // remove existing box if already present - if(!isLPEditFeaturesActive) { + if(!config.isLPEditFeaturesActive) { return; } @@ -1205,7 +1202,7 @@ function RemoteFunctions(config) { } function onElementHover(event) { - if (_hoverHighlight && isLPEditFeaturesActive) { + if (_hoverHighlight && config.isLPEditFeaturesActive) { _hoverHighlight.clear(); // Skip highlighting for HTML and BODY tags and for DOM elements which doesn't have 'data-brackets-id' @@ -1236,7 +1233,7 @@ function RemoteFunctions(config) { } function onElementHoverOut(event) { - if (_hoverHighlight && isLPEditFeaturesActive) { + if (_hoverHighlight && config.isLPEditFeaturesActive) { _hoverHighlight.clear(); // Restore original background color @@ -1265,7 +1262,7 @@ function RemoteFunctions(config) { function onClick(event) { // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' if ( - isLPEditFeaturesActive && + config.isLPEditFeaturesActive && event.target.hasAttribute("data-brackets-id") && event.target.tagName !== "BODY" && event.target.tagName !== "HTML" @@ -1314,7 +1311,7 @@ function RemoteFunctions(config) { */ function onDoubleClick(event) { if ( - isLPEditFeaturesActive && + config.isLPEditFeaturesActive && event.target.hasAttribute("data-brackets-id") && event.target.tagName !== "BODY" && event.target.tagName !== "HTML" @@ -1786,7 +1783,7 @@ function RemoteFunctions(config) { // Function to handle direct editing of elements in the live preview function startEditing(element) { - if (!isLPEditFeaturesActive + if (!config.isLPEditFeaturesActive || !element || element.tagName === "BODY" || element.tagName === "HTML" @@ -1835,7 +1832,7 @@ function RemoteFunctions(config) { // Function to finish editing and apply changes // isEditSuccessful: this is a boolean value, defaults to true. false only when the edit operation is cancelled function finishEditing(element, isEditSuccessful = true) { - if (!isLPEditFeaturesActive || !element || !element.hasAttribute("contenteditable")) { + if (!config.isLPEditFeaturesActive || !element || !element.hasAttribute("contenteditable")) { return; } @@ -1866,7 +1863,7 @@ function RemoteFunctions(config) { // init _editHandler = new DOMEditHandler(window.document); - if (isLPEditFeaturesActive) { + if (config.isLPEditFeaturesActive) { // Initialize hover highlight with Chrome-like colors _hoverHighlight = new Highlight("#c8f9c5", true); // Green similar to Chrome's padding color diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 5a02c9b755..f38598a130 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -45,8 +45,15 @@ define(function main(require, exports, module) { EventDispatcher = require("utils/EventDispatcher"), WorkspaceManager = require("view/WorkspaceManager"); + + // this is responsible to make the advanced live preview features active or inactive + let isLPEditFeaturesActive = true; + const EVENT_LIVE_HIGHLIGHT_PREF_CHANGED = "liveHighlightPrefChange"; + const PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT = "livePreviewElementHighlights"; + const elemHighlightsPrefValue = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT); + var params = new UrlParams(); var config = { experimental: false, // enable experimental features @@ -58,7 +65,9 @@ define(function main(require, exports, module) { marginColor: {r: 246, g: 178, b: 107, a: 0.66}, paddingColor: {r: 147, g: 196, b: 125, a: 0.66}, showInfo: true - } + }, + isLPEditFeaturesActive: isLPEditFeaturesActive, + elemHighlights: elemHighlightsPrefValue }; // Status labels/styles are ordered: error, not connected, progress1, progress2, connected. var _status, @@ -330,6 +339,9 @@ define(function main(require, exports, module) { EventDispatcher.makeEventDispatcher(exports); + exports.isLPEditFeaturesActive = isLPEditFeaturesActive; + exports.PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT = PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT; + // public events exports.EVENT_OPEN_PREVIEW_URL = MultiBrowserLiveDev.EVENT_OPEN_PREVIEW_URL; exports.EVENT_CONNECTION_CLOSE = MultiBrowserLiveDev.EVENT_CONNECTION_CLOSE; diff --git a/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js b/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js index d301b340d6..c2489179be 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js +++ b/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js @@ -41,6 +41,7 @@ define(function (require, exports, module) { const livePreviewSettings = require("text!./livePreviewSettings.html"), + LiveDevelopmentMain = require("LiveDevelopment/main"), Dialogs = require("widgets/Dialogs"), ProjectManager = require("project/ProjectManager"), Strings = require("strings"), @@ -87,7 +88,10 @@ define(function (require, exports, module) { description: Strings.LIVE_DEV_SETTINGS_FRAMEWORK_PREFERENCES, values: Object.keys(SUPPORTED_FRAMEWORKS) }); - + PreferencesManager.definePreference(LiveDevelopmentMain.PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, "string", "hover", { + description: "show live preview element highlights on 'hover' or 'click'. Defaults to 'hover'" + }); + async function detectFramework($frameworkSelect, $hotReloadChk) { for(let framework of Object.keys(SUPPORTED_FRAMEWORKS)){ const configFile = SUPPORTED_FRAMEWORKS[framework].configFile, @@ -130,7 +134,8 @@ define(function (require, exports, module) { $hotReloadChk = $template.find("#hotReloadChk"), $hotReloadLabel = $template.find("#hotReloadLabel"), $frameworkLabel = $template.find("#frameworkLabel"), - $frameworkSelect = $template.find("#frameworkSelect"); + $frameworkSelect = $template.find("#frameworkSelect"), + $elementHighlights = $template.find("#elementHighlightWrapper"); $enableCustomServerChk.prop('checked', PreferencesManager.get(PREFERENCE_PROJECT_SERVER_ENABLED)); $showLivePreviewAtStartup.prop('checked', PreferencesManager.get(PREFERENCE_SHOW_LIVE_PREVIEW_PANEL)); $hotReloadChk.prop('checked', !!PreferencesManager.get(PREFERENCE_PROJECT_SERVER_HOT_RELOAD_SUPPORTED)); @@ -163,6 +168,12 @@ define(function (require, exports, module) { $frameworkSelect.addClass("forced-hidden"); $frameworkLabel.addClass("forced-hidden"); } + + if(LiveDevelopmentMain.isLPEditFeaturesActive) { + $elementHighlights.removeClass("forced-hidden"); + } else { + $elementHighlights.addClass("forced-hidden"); + } } $livePreviewServerURL.on("input", refreshValues); diff --git a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html index ad3cd9aa89..8b10603ac7 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html +++ b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html @@ -25,6 +25,15 @@

{{Strings.LIVE_DEV_SETTINGS_TITLE}}

+ +
+
+ + +
From 899728dd6e0e02b4a3f67b22116ce70da741f333 Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 4 Aug 2025 22:31:36 +0530 Subject: [PATCH 092/849] feat: change live preview effect when setting is changed --- .../BrowserScripts/RemoteFunctions.js | 99 +++++++++++++++++-- src/LiveDevelopment/main.js | 14 ++- .../LivePreviewSettings.js | 13 ++- .../livePreviewSettings.html | 4 +- 4 files changed, 115 insertions(+), 15 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 9c4199019a..bc12d719e3 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1201,8 +1201,30 @@ function RemoteFunctions(config) { window.document.removeEventListener("mousemove", onMouseMove); } + // helper function to get the current elements highlight mode + // this is as per user settings (either click or hover) + function getHighlightMode() { + return config.elemHighlights ? config.elemHighlights.toLowerCase() : "hover"; + } + + // helper function to check if highlights should show on hover + function shouldShowHighlightOnHover() { + return getHighlightMode() !== "click"; + } + + // helper function to clear element background highlighting + function clearElementBackground(element) { + if (element._originalBackgroundColor !== undefined) { + element.style.backgroundColor = element._originalBackgroundColor; + } else { + element.style.backgroundColor = ""; + } + delete element._originalBackgroundColor; + } + function onElementHover(event) { - if (_hoverHighlight && config.isLPEditFeaturesActive) { + // this is to check the user's settings, if they want to show the elements highlights on hover or click + if (_hoverHighlight && config.isLPEditFeaturesActive && shouldShowHighlightOnHover()) { _hoverHighlight.clear(); // Skip highlighting for HTML and BODY tags and for DOM elements which doesn't have 'data-brackets-id' @@ -1233,17 +1255,18 @@ function RemoteFunctions(config) { } function onElementHoverOut(event) { - if (_hoverHighlight && config.isLPEditFeaturesActive) { + // this is to check the user's settings, if they want to show the elements highlights on hover or click + if (_hoverHighlight && config.isLPEditFeaturesActive && shouldShowHighlightOnHover()) { _hoverHighlight.clear(); // Restore original background color - if (event && event.target && event.target.nodeType === Node.ELEMENT_NODE && event.target.hasAttribute("data-brackets-id")) { - if (event.target._originalBackgroundColor !== undefined) { - event.target.style.backgroundColor = event.target._originalBackgroundColor; - } else { - event.target.style.backgroundColor = ""; - } - delete event.target._originalBackgroundColor; + if ( + event && + event.target && + event.target.nodeType === Node.ELEMENT_NODE && + event.target.hasAttribute("data-brackets-id") + ) { + clearElementBackground(event.target); } // Remove info box when mouse leaves the element @@ -1284,6 +1307,11 @@ function RemoteFunctions(config) { previouslyClickedElement.style.outline = ""; } delete previouslyClickedElement._originalOutline; + + // Remove highlighting from previously clicked element + if (getHighlightMode() === "click") { + clearElementBackground(previouslyClickedElement); + } } _nodeMoreOptionsBox = new NodeMoreOptionsBox(event.target); @@ -1296,6 +1324,18 @@ function RemoteFunctions(config) { event.target._originalOutline = event.target.style.outline; event.target.style.outline = "1px solid #4285F4"; + + // Add highlight for click mode + if (getHighlightMode() === "click") { + event.target._originalBackgroundColor = event.target.style.backgroundColor; + event.target.style.backgroundColor = "rgba(0, 162, 255, 0.2)"; + + if (_hoverHighlight) { + _hoverHighlight.clear(); + _hoverHighlight.add(event.target, true); // true for animation + } + } + previouslyClickedElement = event.target; } else if ( // when user clicks on the HTML or the BODY tag, we want to remove the boxes _nodeMoreOptionsBox && @@ -1724,6 +1764,37 @@ function RemoteFunctions(config) { _nodeMoreOptionsBox = null; } } + + // Handle element highlight mode changes for instant switching + const oldHighlightMode = oldConfig.elemHighlights ? oldConfig.elemHighlights.toLowerCase() : "hover"; + const newHighlightMode = getHighlightMode(); + + if (oldHighlightMode !== newHighlightMode) { + // Clear any existing highlights when mode changes + if (_hoverHighlight) { + _hoverHighlight.clear(); + } + + // Clean up any previously highlighted elements + if (previouslyClickedElement) { + clearElementBackground(previouslyClickedElement); + } + + // Remove info box when switching modes to avoid confusion + if (_nodeInfoBox && !_nodeMoreOptionsBox) { + _nodeInfoBox.remove(); + _nodeInfoBox = null; + } + + // Re-setup event listeners based on new mode to ensure proper behavior + if (config.highlight && config.isLPEditFeaturesActive) { + window.document.removeEventListener("mouseover", onElementHover); + window.document.removeEventListener("mouseout", onElementHoverOut); + window.document.addEventListener("mouseover", onElementHover); + window.document.addEventListener("mouseout", onElementHoverOut); + } + } + return JSON.stringify(config); } @@ -1762,6 +1833,16 @@ function RemoteFunctions(config) { previouslyClickedElement.style.outline = ""; } delete previouslyClickedElement._originalOutline; + + // Clear click-mode highlighting + if (getHighlightMode() === "click") { + clearElementBackground(previouslyClickedElement); + + if (_hoverHighlight) { + _hoverHighlight.clear(); + } + } + previouslyClickedElement = null; dismissed = true; } diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index f38598a130..347a3c436d 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -52,7 +52,6 @@ define(function main(require, exports, module) { const EVENT_LIVE_HIGHLIGHT_PREF_CHANGED = "liveHighlightPrefChange"; const PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT = "livePreviewElementHighlights"; - const elemHighlightsPrefValue = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT); var params = new UrlParams(); var config = { @@ -67,7 +66,7 @@ define(function main(require, exports, module) { showInfo: true }, isLPEditFeaturesActive: isLPEditFeaturesActive, - elemHighlights: elemHighlightsPrefValue + elemHighlights: "hover" // default value, this will get updated when the extension loads }; // Status labels/styles are ordered: error, not connected, progress1, progress2, connected. var _status, @@ -301,7 +300,18 @@ define(function main(require, exports, module) { } }); + // this function is responsible to update element highlight config + function updateElementHighlightConfig() { + const prefValue = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT); + config.elemHighlights = prefValue || "hover"; + } + + PreferencesManager.on("change", PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, function() { + updateElementHighlightConfig(); + }); + MultiBrowserLiveDev.on(MultiBrowserLiveDev.EVENT_OPEN_PREVIEW_URL, function (event, previewDetails) { + updateElementHighlightConfig(); exports.trigger(exports.EVENT_OPEN_PREVIEW_URL, previewDetails); }); MultiBrowserLiveDev.on(MultiBrowserLiveDev.EVENT_CONNECTION_CLOSE, function (event, {clientId}) { diff --git a/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js b/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js index c2489179be..37784f0206 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js +++ b/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js @@ -135,11 +135,14 @@ define(function (require, exports, module) { $hotReloadLabel = $template.find("#hotReloadLabel"), $frameworkLabel = $template.find("#frameworkLabel"), $frameworkSelect = $template.find("#frameworkSelect"), - $elementHighlights = $template.find("#elementHighlightWrapper"); + $elementHighlights = $template.find("#elementHighlightWrapper"), // to show/hide this setting + $elementHighlight = $template.find("#elementHighlight"); // dropdown for highlight mode selection + + // Initialize form values from preferences $enableCustomServerChk.prop('checked', PreferencesManager.get(PREFERENCE_PROJECT_SERVER_ENABLED)); $showLivePreviewAtStartup.prop('checked', PreferencesManager.get(PREFERENCE_SHOW_LIVE_PREVIEW_PANEL)); $hotReloadChk.prop('checked', !!PreferencesManager.get(PREFERENCE_PROJECT_SERVER_HOT_RELOAD_SUPPORTED)); - // figure out the framework + $elementHighlight.val(PreferencesManager.get(LiveDevelopmentMain.PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT)); if(PreferencesManager.get(PREFERENCE_PROJECT_PREVIEW_FRAMEWORK) === null) { detectFramework($frameworkSelect, $hotReloadChk); @@ -187,6 +190,12 @@ define(function (require, exports, module) { PreferencesManager.set(PREFERENCE_SHOW_LIVE_PREVIEW_PANEL, $showLivePreviewAtStartup.is(":checked")); _saveProjectPreferences($enableCustomServerChk.is(":checked"), $livePreviewServerURL.val(), $serveRoot.val(), $hotReloadChk.is(":checked"), $frameworkSelect.val()); + + // Save element highlight preference + PreferencesManager.set( + LiveDevelopmentMain.PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, + $elementHighlight.val() + ); } resolve(); }); diff --git a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html index 8b10603ac7..d9d9af726a 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html +++ b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html @@ -30,8 +30,8 @@

{{Strings.LIVE_DEV_SETTINGS_TITLE}}

From 840b701955dea1983f37499b81153e7d74d94634 Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 5 Aug 2025 11:09:10 +0530 Subject: [PATCH 093/849] fix: element highlights setting not getting applied immediately directly --- .../BrowserScripts/RemoteFunctions.js | 34 +++++++++++-------- src/LiveDevelopment/LiveDevMultiBrowser.js | 20 +++++++++++ src/LiveDevelopment/main.js | 8 +++-- 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index bc12d719e3..cac7189338 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1944,22 +1944,25 @@ function RemoteFunctions(config) { // init _editHandler = new DOMEditHandler(window.document); - if (config.isLPEditFeaturesActive) { - // Initialize hover highlight with Chrome-like colors - _hoverHighlight = new Highlight("#c8f9c5", true); // Green similar to Chrome's padding color - - // Initialize click highlight with animation - _clickHighlight = new Highlight("#cfc", true); // Light green for click highlight - - window.document.addEventListener("mouseover", onElementHover); - window.document.addEventListener("mouseout", onElementHoverOut); - window.document.addEventListener("click", onClick); - window.document.addEventListener("dblclick", onDoubleClick); - window.document.addEventListener("dragover", onDragOver); - window.document.addEventListener("drop", onDrop); - window.document.addEventListener("keydown", onKeyDown); + function registerHandlers() { + if (config.isLPEditFeaturesActive) { + // Initialize hover highlight with Chrome-like colors + _hoverHighlight = new Highlight("#c8f9c5", true); // Green similar to Chrome's padding color + + // Initialize click highlight with animation + _clickHighlight = new Highlight("#cfc", true); // Light green for click highlight + + window.document.addEventListener("mouseover", onElementHover); + window.document.addEventListener("mouseout", onElementHoverOut); + window.document.addEventListener("click", onClick); + window.document.addEventListener("dblclick", onDoubleClick); + window.document.addEventListener("dragover", onDragOver); + window.document.addEventListener("drop", onDrop); + window.document.addEventListener("keydown", onKeyDown); + } } + registerHandlers(); return { "DOMEditHandler" : DOMEditHandler, @@ -1973,6 +1976,7 @@ function RemoteFunctions(config) { "startEditing" : startEditing, "finishEditing" : finishEditing, "dismissMoreOptionsBox" : dismissMoreOptionsBox, - "hasVisibleLivePreviewBoxes" : hasVisibleLivePreviewBoxes + "hasVisibleLivePreviewBoxes" : hasVisibleLivePreviewBoxes, + "registerHandlers" : registerHandlers }; } diff --git a/src/LiveDevelopment/LiveDevMultiBrowser.js b/src/LiveDevelopment/LiveDevMultiBrowser.js index 0f2d54836f..976acda42b 100644 --- a/src/LiveDevelopment/LiveDevMultiBrowser.js +++ b/src/LiveDevelopment/LiveDevMultiBrowser.js @@ -718,6 +718,24 @@ define(function (require, exports, module) { } } + /** + * Register event handlers in the remote browser for live preview functionality + */ + function registerHandlers() { + if (_protocol) { + _protocol.evaluate("_LD.registerHandlers()"); + } + } + + /** + * Update configuration in the remote browser + */ + function updateConfig(configJSON) { + if (_protocol) { + _protocol.evaluate("_LD.updateConfig('" + configJSON + "')"); + } + } + /** * Originally unload and reload agents. It doesn't apply for this new implementation. * @return {jQuery.Promise} Already resolved promise. @@ -786,6 +804,8 @@ define(function (require, exports, module) { exports.redrawHighlight = redrawHighlight; exports.hasVisibleLivePreviewBoxes = hasVisibleLivePreviewBoxes; exports.dismissLivePreviewBoxes = dismissLivePreviewBoxes; + exports.registerHandlers = registerHandlers; + exports.updateConfig = updateConfig; exports.init = init; exports.isActive = isActive; exports.setLivePreviewPinned= setLivePreviewPinned; diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 347a3c436d..e35896cc4f 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -296,7 +296,7 @@ define(function main(require, exports, module) { .on("change", function () { config.remoteHighlight = prefs.get(PREF_REMOTEHIGHLIGHT); if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) { - MultiBrowserLiveDev.agents.remote.call("updateConfig",JSON.stringify(config)); + MultiBrowserLiveDev.updateConfig(JSON.stringify(config)); } }); @@ -304,6 +304,10 @@ define(function main(require, exports, module) { function updateElementHighlightConfig() { const prefValue = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT); config.elemHighlights = prefValue || "hover"; + if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) { + MultiBrowserLiveDev.updateConfig(JSON.stringify(config)); + MultiBrowserLiveDev.registerHandlers(); + } } PreferencesManager.on("change", PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, function() { @@ -335,7 +339,7 @@ define(function main(require, exports, module) { config.highlight = PreferencesManager.getViewState("livedevHighlight"); _updateHighlightCheckmark(); if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) { - MultiBrowserLiveDev.agents.remote.call("updateConfig",JSON.stringify(config)); + MultiBrowserLiveDev.updateConfig(JSON.stringify(config)); } }); From 9c8859fc87a051ae8ee9c256e4c17dd5b567802b Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 5 Aug 2025 14:05:22 +0530 Subject: [PATCH 094/849] feat: add strings for elements highlight feature --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 8 ++++---- src/LiveDevelopment/main.js | 11 ++++++++++- .../Phoenix-live-preview/LivePreviewSettings.js | 2 +- .../Phoenix-live-preview/livePreviewSettings.html | 7 +++---- src/nls/root/strings.js | 8 ++++++++ 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index cac7189338..423b5cb517 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -562,23 +562,23 @@ function RemoteFunctions(config) { // Only include select parent option if element supports it if (showSelectParentOption) { - content += ` + content += ` ${ICONS.arrowUp} `; } // Only include edit text option if element supports it if (showEditTextOption) { - content += ` + content += ` ${ICONS.edit} `; } // Always include duplicate and delete options - content += ` + content += ` ${ICONS.copy} - + ${ICONS.trash} `; diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index e35896cc4f..4d2c095850 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -66,7 +66,16 @@ define(function main(require, exports, module) { showInfo: true }, isLPEditFeaturesActive: isLPEditFeaturesActive, - elemHighlights: "hover" // default value, this will get updated when the extension loads + elemHighlights: "hover", // default value, this will get updated when the extension loads + // this strings are used in RemoteFunctions.js + // we need to pass this through config as remoteFunctions runs in browser context and cannot + // directly reference Strings file + strings: { + selectParent: Strings.LIVE_DEV_MORE_OPTIONS_SELECT_PARENT, + editText: Strings.LIVE_DEV_MORE_OPTIONS_EDIT_TEXT, + duplicate: Strings.LIVE_DEV_MORE_OPTIONS_DUPLICATE, + delete: Strings.LIVE_DEV_MORE_OPTIONS_DELETE + } }; // Status labels/styles are ordered: error, not connected, progress1, progress2, connected. var _status, diff --git a/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js b/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js index 37784f0206..d5807c40de 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js +++ b/src/extensionsIntegrated/Phoenix-live-preview/LivePreviewSettings.js @@ -89,7 +89,7 @@ define(function (require, exports, module) { values: Object.keys(SUPPORTED_FRAMEWORKS) }); PreferencesManager.definePreference(LiveDevelopmentMain.PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, "string", "hover", { - description: "show live preview element highlights on 'hover' or 'click'. Defaults to 'hover'" + description: Strings.LIVE_DEV_SETTINGS_ELEMENT_HIGHLIGHT_PREFERENCE }); async function detectFramework($frameworkSelect, $hotReloadChk) { diff --git a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html index d9d9af726a..d76c79ef83 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html +++ b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html @@ -27,11 +27,10 @@

{{Strings.LIVE_DEV_SETTINGS_TITLE}}

-
- +
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 88c738c16d..ae92f3b4ce 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -179,6 +179,14 @@ define({ "LIVE_DEV_SETTINGS_FRAMEWORK": "Server Framework", "LIVE_DEV_SETTINGS_FRAMEWORK_CUSTOM": "Custom", "LIVE_DEV_SETTINGS_FRAMEWORK_PREFERENCES": "Server Framework, currently supports only docusaurus", + "LIVE_DEV_SETTINGS_ELEMENT_HIGHLIGHT": "Show Live Preview Element Highlights on:", + "LIVE_DEV_SETTINGS_ELEMENT_HIGHLIGHT_HOVER": "hover", + "LIVE_DEV_SETTINGS_ELEMENT_HIGHLIGHT_CLICK": "click", + "LIVE_DEV_SETTINGS_ELEMENT_HIGHLIGHT_PREFERENCE": "show live preview element highlights on 'hover' or 'click'. Defaults to 'hover'", + "LIVE_DEV_MORE_OPTIONS_SELECT_PARENT": "Select Parent", + "LIVE_DEV_MORE_OPTIONS_EDIT_TEXT": "Edit Text", + "LIVE_DEV_MORE_OPTIONS_DUPLICATE": "Duplicate", + "LIVE_DEV_MORE_OPTIONS_DELETE": "Delete", "LIVE_PREVIEW_CUSTOM_SERVER_BANNER": "Getting preview from your custom server {0}", "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Preview was canceled because the browser's developer tools were opened", From bfd3c16381f2b610d0239ef0faa29bbab5188e13 Mon Sep 17 00:00:00 2001 From: Pluto Date: Tue, 5 Aug 2025 14:14:41 +0530 Subject: [PATCH 095/849] feat: improve styles for element highlight setting --- .../Phoenix-live-preview/livePreviewSettings.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html index d76c79ef83..71024d9a44 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html +++ b/src/extensionsIntegrated/Phoenix-live-preview/livePreviewSettings.html @@ -26,8 +26,8 @@

{{Strings.LIVE_DEV_SETTINGS_TITLE}}

-
- +
+ + +
+
+ `; + + shadow.innerHTML = `${content}`; + this._shadow = shadow; + }, + + create: function() { + this._style(); + window.document.body.appendChild(this.body); + + // Get the actual rendered dimensions of the box and position it + const boxElement = this._shadow.querySelector('.phoenix-ai-prompt-box'); + if (boxElement) { + const boxRect = boxElement.getBoundingClientRect(); + const pos = this._getBoxPosition(boxRect.width, boxRect.height); + + boxElement.style.left = pos.leftPos + 'px'; + boxElement.style.top = pos.topPos + 'px'; + } + + // Focus on the textarea + const textarea = this._shadow.querySelector('.phoenix-ai-prompt-textarea'); + if (textarea) { // small timer to make sure that the text area element is fetched + setTimeout(() => textarea.focus(), 50); + } + + this._attachEventHandlers(); + + // Prevent clicks inside the AI box from bubbling up and closing it + this.body.addEventListener('click', (event) => { + event.stopPropagation(); + }); + }, + + _attachEventHandlers: function() { + const textarea = this._shadow.querySelector('.phoenix-ai-prompt-textarea'); + const sendButton = this._shadow.querySelector('.phoenix-ai-prompt-send-button'); + + // Handle textarea input to enable/disable send button + if (textarea && sendButton) { + textarea.addEventListener('input', (event) => { + const hasText = event.target.value.trim().length > 0; + sendButton.disabled = !hasText; + }); + + // enter key + textarea.addEventListener('keydown', (event) => { + if (event.key === 'Enter' && !event.shiftKey) { + event.preventDefault(); + if (textarea.value.trim()) { + this._handleSend(textarea.value.trim()); + } + } else if (event.key === 'Escape') { + event.preventDefault(); + this.remove(); + } + }); + } + + // send button click + if (sendButton) { + sendButton.addEventListener('click', (event) => { + event.preventDefault(); + event.stopPropagation(); + if (textarea && textarea.value.trim()) { + this._handleSend(textarea.value.trim()); + } + }); + } + }, + + _handleSend: function(prompt) { + // TODO: need to implement the logic for backend handling here + console.log('AI Prompt:', prompt, 'for element:', this.element); + this.remove(); + }, + + remove: function() { + if (this._handleKeydown) { + document.removeEventListener('keydown', this._handleKeydown); + this._handleKeydown = null; + } + + if (this._handleResize) { + window.removeEventListener('resize', this._handleResize); + this._handleResize = null; + } + + if (this.body && this.body.parentNode && this.body.parentNode === window.document.body) { + window.document.body.removeChild(this.body); + this.body = null; + _aiPromptBox = null; + } + } + }; + function Highlight(color, trigger) { this.color = color; this.trigger = !!trigger; @@ -1829,6 +2091,7 @@ function RemoteFunctions(config) { var _clickHighlight; var _nodeInfoBox; var _nodeMoreOptionsBox; + var _aiPromptBox; var _setup = false; @@ -1904,9 +2167,7 @@ function RemoteFunctions(config) { _hoverHighlight.add(event.target, false, false); // false means no auto-scroll // Create info box for the hovered element - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - } + dismissNodeInfoBox(); _nodeInfoBox = new NodeInfoBox(event.target); } } @@ -1933,10 +2194,7 @@ function RemoteFunctions(config) { } // Remove info box when mouse leaves the element - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - _nodeInfoBox = null; - } + dismissNodeInfoBox(); } } @@ -1980,20 +2238,13 @@ function RemoteFunctions(config) { if (isElementVisible(element)) { _nodeMoreOptionsBox = new NodeMoreOptionsBox(element); - // show the info box when a DOM element is selected - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - } + // show the info box when a DOM element is selected, but first remove any existing info box + dismissNodeInfoBox(); _nodeInfoBox = new NodeInfoBox(element); } else { // Element is hidden, so don't show UI boxes but still apply visual styling _nodeMoreOptionsBox = null; - - // Remove any existing info box since the element is not visible - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - _nodeInfoBox = null; - } + dismissNodeInfoBox(); } element._originalOutline = element.style.outline; @@ -2019,6 +2270,8 @@ function RemoteFunctions(config) { * @param {Event} event */ function onClick(event) { + dismissAIPromptBox(); + // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' if ( config.isLPEditFeaturesActive && @@ -2036,7 +2289,7 @@ function RemoteFunctions(config) { _nodeMoreOptionsBox && (event.target.tagName === "HTML" || event.target.tagName === "BODY" || _isInsideHeadTag(event.target)) ) { - dismissMoreOptionsBox(); + dismissUIAndCleanupState(); } } @@ -2075,7 +2328,7 @@ function RemoteFunctions(config) { function onKeyDown(event) { if ((event.key === "Escape" || event.key === "Esc")) { - dismissMoreOptionsBox(); + dismissUIAndCleanupState(); } if (!_setup && _validEvent(event)) { window.document.addEventListener("keyup", onKeyUp); @@ -2088,9 +2341,6 @@ function RemoteFunctions(config) { } } - /** Public Commands **********************************************************/ - - // remove active highlights function hideHighlight() { if (_clickHighlight) { @@ -2144,7 +2394,7 @@ function RemoteFunctions(config) { // if no valid element present we dismiss the boxes if (!foundValidElement) { - dismissMoreOptionsBox(); + dismissUIAndCleanupState(); } } @@ -2156,10 +2406,16 @@ function RemoteFunctions(config) { _nodeMoreOptionsBox = new NodeMoreOptionsBox(element); if (_nodeInfoBox) { - _nodeInfoBox.remove(); + dismissNodeInfoBox(); _nodeInfoBox = new NodeInfoBox(element); } } + + if (_aiPromptBox) { + const element = _aiPromptBox.element; + _aiPromptBox.remove(); + _aiPromptBox = new AIPromptBox(element); + } } // redraw active highlights @@ -2202,7 +2458,7 @@ function RemoteFunctions(config) { // 4 is just for pixelated differences if (Math.abs(calcNewDifference - prevDifference) > 4) { - dismissMoreOptionsBox(); + dismissUIAndCleanupState(); } } } @@ -2226,7 +2482,7 @@ function RemoteFunctions(config) { const prevDifference = _nodeInfoBox._possDifference; if (Math.abs(calcNewDifference - prevDifference) > 4) { - dismissMoreOptionsBox(); + dismissUIAndCleanupState(); } } } @@ -2525,14 +2781,8 @@ function RemoteFunctions(config) { window.document.removeEventListener("mouseout", onElementHoverOut); // Remove info box and more options box if highlight is disabled - if (_nodeInfoBox) { - _nodeInfoBox.remove(); - _nodeInfoBox = null; - } - if (_nodeMoreOptionsBox) { - _nodeMoreOptionsBox.remove(); - _nodeMoreOptionsBox = null; - } + dismissNodeInfoBox(); + dismissNodeMoreOptionsBox(); } // Handle element highlight mode changes for instant switching @@ -2560,8 +2810,7 @@ function RemoteFunctions(config) { // Remove info box when switching modes to avoid confusion if (_nodeInfoBox && !_nodeMoreOptionsBox) { - _nodeInfoBox.remove(); - _nodeInfoBox = null; + dismissNodeInfoBox(); } // Re-setup event listeners based on new mode to ensure proper behavior @@ -2585,25 +2834,61 @@ function RemoteFunctions(config) { } /** - * This function is responsible to remove the more options box - * we do this either when user presses the Esc key or clicks on the HTML or Body tags - * @return {boolean} true if any boxes were dismissed, false otherwise + * Helper function to dismiss NodeMoreOptionsBox if it exists + * @return {boolean} true if box was dismissed, false if it didn't exist */ - function dismissMoreOptionsBox() { - let dismissed = false; - + function dismissNodeMoreOptionsBox() { if (_nodeMoreOptionsBox) { _nodeMoreOptionsBox.remove(); _nodeMoreOptionsBox = null; - dismissed = true; + return true; } + return false; + } + /** + * Helper function to dismiss NodeInfoBox if it exists + * @return {boolean} true if box was dismissed, false if it didn't exist + */ + function dismissNodeInfoBox() { if (_nodeInfoBox) { _nodeInfoBox.remove(); _nodeInfoBox = null; - dismissed = true; + return true; } + return false; + } + /** + * Helper function to dismiss AIPromptBox if it exists + * @return {boolean} true if box was dismissed, false if it didn't exist + */ + function dismissAIPromptBox() { + if (_aiPromptBox) { + _aiPromptBox.remove(); + _aiPromptBox = null; + return true; + } + return false; + } + + /** + * Helper function to dismiss all UI boxes at once + * @return {boolean} true if any boxes were dismissed, false otherwise + */ + function dismissAllUIBoxes() { + let dismissed = false; + dismissed = dismissNodeMoreOptionsBox() || dismissed; + dismissed = dismissAIPromptBox() || dismissed; + dismissed = dismissNodeInfoBox() || dismissed; + return dismissed; + } + + /** + * Helper function to cleanup previously clicked element highlighting and state + * @return {boolean} true if cleanup was performed, false if no element to cleanup + */ + function cleanupPreviousElementState() { if (previouslyClickedElement) { if (previouslyClickedElement._originalOutline !== undefined) { previouslyClickedElement.style.outline = previouslyClickedElement._originalOutline; @@ -2622,12 +2907,29 @@ function RemoteFunctions(config) { } previouslyClickedElement = null; - dismissed = true; + return true; } + return false; + } + + /** + * This function dismisses all UI elements and cleans up application state + * Called when user presses Esc key, clicks on HTML/Body tags, or other dismissal events + * @return {boolean} true if any cleanup was performed, false otherwise + */ + function dismissUIAndCleanupState() { + let dismissed = false; + + // Dismiss all UI boxes + dismissed = dismissAllUIBoxes() || dismissed; + + // Cleanup previously clicked element state and highlighting + dismissed = cleanupPreviousElementState() || dismissed; return dismissed; } + /** * This function is responsible to move the cursor to the end of the text content when we start editing * @param {DOMElement} element @@ -2661,7 +2963,7 @@ function RemoteFunctions(config) { moveCursorToEnd(selection, element); } - dismissMoreOptionsBox(); + dismissUIAndCleanupState(); function onBlur() { finishEditing(element); @@ -2698,7 +3000,7 @@ function RemoteFunctions(config) { // Remove contenteditable attribute element.removeAttribute("contenteditable"); - dismissMoreOptionsBox(); + dismissUIAndCleanupState(); // Remove event listeners if (element._editListeners) { @@ -2755,7 +3057,6 @@ function RemoteFunctions(config) { "updateConfig" : updateConfig, "startEditing" : startEditing, "finishEditing" : finishEditing, - "dismissMoreOptionsBox" : dismissMoreOptionsBox, "hasVisibleLivePreviewBoxes" : hasVisibleLivePreviewBoxes, "registerHandlers" : registerHandlers }; From efd41fcd177db9fd8acadd7cb13de1b01e2b0a92 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 15 Aug 2025 14:34:06 +0530 Subject: [PATCH 124/849] feat: add live preview mode settings to preferences --- .../BrowserScripts/RemoteFunctions.js | 3 +- src/LiveDevelopment/LiveDevMultiBrowser.js | 4 +- .../Phoenix-live-preview/main.js | 73 +++++++++++++++++-- 3 files changed, 71 insertions(+), 9 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 0845aeed80..aea1a05209 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -2830,7 +2830,7 @@ function RemoteFunctions(config) { * @return {boolean} true if any boxes are visible, false otherwise */ function hasVisibleLivePreviewBoxes() { - return _nodeMoreOptionsBox !== null || _nodeInfoBox !== null || previouslyClickedElement !== null; + return _nodeMoreOptionsBox !== null || _nodeInfoBox !== null || _aiPromptBox !== null || previouslyClickedElement !== null; } /** @@ -3058,6 +3058,7 @@ function RemoteFunctions(config) { "startEditing" : startEditing, "finishEditing" : finishEditing, "hasVisibleLivePreviewBoxes" : hasVisibleLivePreviewBoxes, + "dismissUIAndCleanupState" : dismissUIAndCleanupState, "registerHandlers" : registerHandlers }; } diff --git a/src/LiveDevelopment/LiveDevMultiBrowser.js b/src/LiveDevelopment/LiveDevMultiBrowser.js index 976acda42b..3b2381dc09 100644 --- a/src/LiveDevelopment/LiveDevMultiBrowser.js +++ b/src/LiveDevelopment/LiveDevMultiBrowser.js @@ -710,11 +710,11 @@ define(function (require, exports, module) { } /** - * Dismiss live preview more options box and info box + * Dismiss live preview boxes like info box, options box, AI box */ function dismissLivePreviewBoxes() { if (_protocol) { - _protocol.evaluate("_LD.dismissMoreOptionsBox()"); + _protocol.evaluate("_LD.dismissUIAndCleanupState()"); } } diff --git a/src/extensionsIntegrated/Phoenix-live-preview/main.js b/src/extensionsIntegrated/Phoenix-live-preview/main.js index 052ad7ed27..22f86dae9b 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/main.js +++ b/src/extensionsIntegrated/Phoenix-live-preview/main.js @@ -86,6 +86,15 @@ define(function (require, exports, module) { const PREVIEW_TRUSTED_PROJECT_KEY = "preview_trusted"; const PREVIEW_PROJECT_README_KEY = "preview_readme"; + // live preview mode pref + const PREFERENCE_LIVE_PREVIEW_MODE = "livePreviewMode"; + const DEFAULT_LIVE_PREVIEW_MODE = "preview"; // preview, inspect or edit + // define the live preview mode preference + PreferencesManager.definePreference(PREFERENCE_LIVE_PREVIEW_MODE, "string", DEFAULT_LIVE_PREVIEW_MODE, { + description: "Default live preview mode on startup (preview, inspect, edit)", + values: ["preview", "inspect", "edit"] + }); + const LIVE_PREVIEW_PANEL_ID = "live-preview-panel"; const LIVE_PREVIEW_IFRAME_ID = "panel-live-preview-frame"; const LIVE_PREVIEW_IFRAME_HTML = ` @@ -179,6 +188,40 @@ define(function (require, exports, module) { } } + /** + * update the mode button text in the live preview toolbar UI based on the current mode + * @param {String} mode - The current mode ("preview", "inspect", or "edit") + */ + function _updateModeButton(mode) { + if ($modeBtn) { + if (mode === "inspect") { + $modeBtn[0].textContent = "Inspect Mode"; + } else if (mode === "edit") { + $modeBtn[0].textContent = "Edit Mode"; + } else { + $modeBtn[0].textContent = "Preview Mode"; + } + } + } + + /** + * init live preview mode from saved preferences + */ + function _initializeMode() { + const savedMode = PreferencesManager.get(PREFERENCE_LIVE_PREVIEW_MODE) || "preview"; + + // apply the saved + if (savedMode === "inspect") { + _LPInspectMode(); + } else if (savedMode === "edit") { + _LPEditMode(); + } else { + _LPPreviewMode(); + } + + _updateModeButton(savedMode); + } + function _showModeSelectionDropdown(event) { const items = ["Preview Mode", "Inspect Mode", "Edit Mode"]; @@ -204,20 +247,19 @@ define(function (require, exports, module) { // handle the option selection dropdown.on("select", function (e, item, index) { + // here we just set the preference + // as the preferences listener will automatically handle the required changes if (index === 0) { - _LPPreviewMode(); + PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "preview"); } else if (index === 1) { - _LPInspectMode(); + PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "inspect"); } else if (index === 2) { - _LPEditMode(); + PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "edit"); } // need to dismiss the previous highlighting and stuff LiveDevelopment.hideHighlight(); LiveDevelopment.dismissLivePreviewBoxes(); - if($modeBtn) { - $modeBtn[0].textContent = item; - } }); // Remove the button after the dropdown is hidden @@ -897,6 +939,25 @@ define(function (require, exports, module) { fileMenu.addMenuItem(Commands.FILE_LIVE_FILE_PREVIEW_SETTINGS, "", Menus.AFTER, Commands.FILE_LIVE_FILE_PREVIEW); fileMenu.addMenuDivider(Menus.BEFORE, Commands.FILE_LIVE_FILE_PREVIEW); + + // init live preview mode from saved preferences + _initializeMode(); + // listen for pref changes + PreferencesManager.on("change", PREFERENCE_LIVE_PREVIEW_MODE, function () { + // Get the current preference value directly + const newMode = PreferencesManager.get(PREFERENCE_LIVE_PREVIEW_MODE); + + if (newMode === "inspect") { + _LPInspectMode(); + } else if (newMode === "edit") { + _LPEditMode(); + } else { + _LPPreviewMode(); + } + + _updateModeButton(newMode); + }); + LiveDevelopment.openLivePreview(); LiveDevelopment.on(LiveDevelopment.EVENT_OPEN_PREVIEW_URL, _openLivePreviewURL); LiveDevelopment.on(LiveDevelopment.EVENT_LIVE_PREVIEW_RELOAD, ()=>{ From 014044fa2df6ed44babe7a484dacaecd950d0626 Mon Sep 17 00:00:00 2001 From: Pluto Date: Fri, 15 Aug 2025 23:26:55 +0530 Subject: [PATCH 125/849] feat: move all the strings to strings.js file --- .../BrowserScripts/RemoteFunctions.js | 9 +++-- src/LiveDevelopment/main.js | 4 ++- .../Phoenix-live-preview/main.js | 36 ++++++++++--------- src/nls/root/strings.js | 6 ++++ 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index aea1a05209..87545a9113 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1180,7 +1180,7 @@ function RemoteFunctions(config) { let content = `
`; // not sure if we need to hide/show the AI icon, right now showing always - content += ` + content += ` ${ICONS.ai} `; @@ -1681,7 +1681,7 @@ function RemoteFunctions(config) {
- -
- - -
diff --git a/src/extensionsIntegrated/Phoenix-live-preview/main.js b/src/extensionsIntegrated/Phoenix-live-preview/main.js index 7df5778662..2743acba04 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/main.js +++ b/src/extensionsIntegrated/Phoenix-live-preview/main.js @@ -95,6 +95,12 @@ define(function (require, exports, module) { values: ["preview", "highlight", "edit"] }); + // live preview element highlights preference (whether on hover or click) + const PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT = "livePreviewElementHighlights"; + PreferencesManager.definePreference(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, "string", "hover", { + description: Strings.LIVE_DEV_SETTINGS_ELEMENT_HIGHLIGHT_PREFERENCE + }); + const LIVE_PREVIEW_PANEL_ID = "live-preview-panel"; const LIVE_PREVIEW_IFRAME_ID = "panel-live-preview-frame"; const LIVE_PREVIEW_IFRAME_HTML = ` @@ -224,10 +230,22 @@ define(function (require, exports, module) { function _showModeSelectionDropdown(event) { const items = [ - Strings.LIVE_PREVIEW_MODE_PREVIEW, Strings.LIVE_PREVIEW_MODE_HIGHLIGHT, Strings.LIVE_PREVIEW_MODE_EDIT + Strings.LIVE_PREVIEW_MODE_PREVIEW, + Strings.LIVE_PREVIEW_MODE_HIGHLIGHT, + Strings.LIVE_PREVIEW_MODE_EDIT, + "---", + Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON ]; - const dropdown = new DropdownButton.DropdownButton("", items); + const dropdown = new DropdownButton.DropdownButton("", items, function(item, index) { + if (item === Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON) { + const isHoverMode = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT) !== "click"; + if(isHoverMode) { + return `✓ ${Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON}`; + } + } + return item; + }); // Append to document body for absolute positioning $("body").append(dropdown.$button); @@ -257,6 +275,12 @@ define(function (require, exports, module) { PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "highlight"); } else if (index === 2) { PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "edit"); + } else if (item === Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON) { + // Toggle between hover and click + const currentMode = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT); + const newMode = currentMode !== "click" ? "click" : "hover"; + PreferencesManager.set(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, newMode); + return; // Don't dismiss highlights for this option } // need to dismiss the previous highlighting and stuff @@ -960,6 +984,14 @@ define(function (require, exports, module) { _updateModeButton(newMode); }); + // Handle element highlight preference changes from this extension + PreferencesManager.on("change", PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT, function() { + LiveDevelopment.updateElementHighlightConfig(); + }); + + // Initialize element highlight config on startup + LiveDevelopment.updateElementHighlightConfig(); + LiveDevelopment.openLivePreview(); LiveDevelopment.on(LiveDevelopment.EVENT_OPEN_PREVIEW_URL, _openLivePreviewURL); LiveDevelopment.on(LiveDevelopment.EVENT_LIVE_PREVIEW_RELOAD, ()=>{ diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index cbbba4168b..4fa52f376a 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -193,6 +193,7 @@ define({ "LIVE_PREVIEW_MODE_PREVIEW": "Preview Mode", "LIVE_PREVIEW_MODE_HIGHLIGHT": "Highlight Mode", "LIVE_PREVIEW_MODE_EDIT": "Edit Mode", + "LIVE_PREVIEW_EDIT_HIGHLIGHT_ON": "Edit Highlights on Hover", "LIVE_PREVIEW_MODE_PREFERENCE": "{0} shows only the webpage, {1} connects the webpage to your code - click on elements to jump to their code and vice versa, {2} provides highlighting along with advanced element manipulation", "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Preview was canceled because the browser's developer tools were opened", From 782048c7091f0e2bc31459510dc2629273b059f1 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 16 Aug 2025 17:43:39 +0530 Subject: [PATCH 128/849] fix: clean dirty icons when no changes are made in the editor --- src/LiveDevelopment/LivePreviewEdit.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LiveDevelopment/LivePreviewEdit.js b/src/LiveDevelopment/LivePreviewEdit.js index 809a34728e..a41a1b0f7b 100644 --- a/src/LiveDevelopment/LivePreviewEdit.js +++ b/src/LiveDevelopment/LivePreviewEdit.js @@ -195,6 +195,7 @@ define(function (require, exports, module) { // the live preview for that element gets refreshed and the changes are discarded in the live preview if(!message.isEditSuccessful) { editor.replaceRange(text, startPos, endPos); + editor.document._markClean(); } else { // if the edit operation was successful, we call a helper function that From 855eb853c800117e420d9564ef51e094e4980e98 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 16 Aug 2025 20:21:39 +0530 Subject: [PATCH 129/849] fix: error when click highlight is null and adding a selector to that --- .../BrowserScripts/RemoteFunctions.js | 16 ++++++---------- .../MultiBrowserImpl/protocol/LiveDevProtocol.js | 5 +++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 1bc54f3d79..c21556cb0d 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -213,12 +213,9 @@ function RemoteFunctions(config) { * @param {DOMElement} element - the HTML DOM element that was clicked */ function _handleAIOptionClick(event, element) { - // make sure there is no existing AI prompt box, also remove more options box - dismissAIPromptBox(); - dismissNodeMoreOptionsBox(); - - // create a new AI prompt box - _aiPromptBox = new AIPromptBox(element); + // make sure there is no existing AI prompt box, and no other box as well + dismissAllUIBoxes(); + _aiPromptBox = new AIPromptBox(element); // create a new one } /** @@ -2094,9 +2091,6 @@ function RemoteFunctions(config) { var _aiPromptBox; var _setup = false; - - /** Event Handlers ***********************************************************/ - function onMouseOver(event) { if (_validEvent(event)) { // Skip highlighting for HTML, BODY tags and elements inside HEAD @@ -2359,7 +2353,9 @@ function RemoteFunctions(config) { for (i = 0; i < nodes.length; i++) { highlight(nodes[i]); } - _clickHighlight.selector = rule; + if (_clickHighlight) { + _clickHighlight.selector = rule; + } // select the first valid highlighted element var foundValidElement = false; diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js index b3206978ca..293dbcc4f5 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js +++ b/src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js @@ -166,8 +166,9 @@ define(function (require, exports, module) { } const allOpenFileCount = MainViewManager.getWorkingSetSize(MainViewManager.ALL_PANES); function selectInHTMLEditor(fullHtmlEditor) { - const position = HTMLInstrumentation.getPositionFromTagId(fullHtmlEditor, parseInt(tagId, 10)).from; - if(position && fullHtmlEditor) { + const positionResult = HTMLInstrumentation.getPositionFromTagId(fullHtmlEditor, parseInt(tagId, 10)); + if(positionResult && positionResult.from && fullHtmlEditor) { + const position = positionResult.from; const masterEditor = fullHtmlEditor.document._masterEditor || fullHtmlEditor; masterEditor.setCursorPos(position.line, position.ch, true); _focusEditorIfNeeded(masterEditor, nodeName, contentEditable); From 981da5d1f42d10878bc650e706f8f98210ca8afd Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 16 Aug 2025 21:15:49 +0530 Subject: [PATCH 130/849] feat: add checkmark icon in the current active mode --- .../Phoenix-live-preview/main.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/extensionsIntegrated/Phoenix-live-preview/main.js b/src/extensionsIntegrated/Phoenix-live-preview/main.js index 2743acba04..dafc5ad162 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/main.js +++ b/src/extensionsIntegrated/Phoenix-live-preview/main.js @@ -237,12 +237,24 @@ define(function (require, exports, module) { Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON ]; + const rawMode = PreferencesManager.get(PREFERENCE_LIVE_PREVIEW_MODE) || "preview"; + // this is to take care of invalid values in the pref file + const currentMode = ["preview", "highlight", "edit"].includes(rawMode) ? rawMode : "preview"; + const dropdown = new DropdownButton.DropdownButton("", items, function(item, index) { - if (item === Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON) { + if (item === Strings.LIVE_PREVIEW_MODE_PREVIEW) { + // using empty spaces to keep content aligned + return currentMode === "preview" ? `✓ ${item}` : `${'\u00A0'.repeat(4)}${item}`; + } else if (item === Strings.LIVE_PREVIEW_MODE_HIGHLIGHT) { + return currentMode === "highlight" ? `✓ ${item}` : `${'\u00A0'.repeat(4)}${item}`; + } else if (item === Strings.LIVE_PREVIEW_MODE_EDIT) { + return currentMode === "edit" ? `✓ ${item}` : `${'\u00A0'.repeat(4)}${item}`; + } else if (item === Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON) { const isHoverMode = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT) !== "click"; if(isHoverMode) { return `✓ ${Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON}`; } + return `${'\u00A0'.repeat(4)}${Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON}`; } return item; }); From 8859176b5b3eb6e3475fdc7cd6ce3d46d1171343 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 16 Aug 2025 22:38:13 +0530 Subject: [PATCH 131/849] fix: ai box width set on smaller screens --- .../BrowserScripts/RemoteFunctions.js | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index c21556cb0d..275d3b1816 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -1562,25 +1562,16 @@ function RemoteFunctions(config) { let topPos = offset.top - boxHeight - 6; // 6 for just some little space to breathe let leftPos = offset.left + elemBounds.width - boxWidth; - // check if the box would go off the top of the viewport + // Check if the box would go off the top of the viewport if (elemBounds.top - boxHeight < 6) { topPos = offset.top + elemBounds.height + 6; } - // check if the box would go off the left of the viewport - if (leftPos < 6) { + // Check if the box would go off the left of the viewport + if (leftPos < 0) { leftPos = offset.left; } - // check if the box would go off the right of the viewport - const viewportWidth = window.innerWidth; - if (leftPos + boxWidth > viewportWidth - 6) { - leftPos = viewportWidth - boxWidth - 6; - } - - // ensure leftPos is never negative - leftPos = Math.max(6, leftPos); - return {topPos: topPos, leftPos: leftPos}; }, @@ -1594,14 +1585,23 @@ function RemoteFunctions(config) { let boxWidth, boxHeight; if (viewportWidth >= 400) { - boxWidth = Math.min(310, viewportWidth * 0.75); // Max 310px or 75% of viewport + boxWidth = Math.min(310, viewportWidth * 0.85); boxHeight = 60; + } else if (viewportWidth >= 350) { + boxWidth = Math.min(275, viewportWidth * 0.85); + boxHeight = 70; } else if (viewportWidth >= 300) { - boxWidth = Math.min(280, viewportWidth * 0.85); // Smaller width for medium screens - boxHeight = 80; // Increase height for better usability + boxWidth = Math.min(230, viewportWidth * 0.85); + boxHeight = 80; + } else if (viewportWidth >= 250) { + boxWidth = Math.min(180, viewportWidth * 0.85); + boxHeight = 100; + } else if (viewportWidth >= 200) { + boxWidth = Math.min(130, viewportWidth * 0.85); + boxHeight = 120; } else { - boxWidth = Math.min(250, viewportWidth * 0.9); // Very narrow screens - boxHeight = 100; // Even more height for very small screens + boxWidth = Math.min(100, viewportWidth * 0.85); + boxHeight = 140; } const styles = ` @@ -1615,6 +1615,7 @@ function RemoteFunctions(config) { z-index: 2147483647; width: ${boxWidth}px; padding: 0; + box-sizing: border-box; } .phoenix-ai-prompt-input-container { From cd1b7805356562edf0f5dd6eff50e1c345a3a0b7 Mon Sep 17 00:00:00 2001 From: Pluto Date: Mon, 18 Aug 2025 09:53:54 +0530 Subject: [PATCH 132/849] feat: show pro icon on edit mode --- .../BrowserScripts/RemoteFunctions.js | 13 +++++ src/LiveDevelopment/main.js | 1 + .../Phoenix-live-preview/live-preview.css | 13 ++++- .../Phoenix-live-preview/main.js | 55 +++++++++++++++---- .../Phoenix-live-preview/panel.html | 6 +- 5 files changed, 73 insertions(+), 15 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 275d3b1816..d6cb6cb07b 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -3007,6 +3007,16 @@ function RemoteFunctions(config) { _editHandler = new DOMEditHandler(window.document); function registerHandlers() { + // Always remove existing listeners first to avoid duplicates + window.document.removeEventListener("mouseover", onElementHover); + window.document.removeEventListener("mouseout", onElementHoverOut); + window.document.removeEventListener("click", onClick); + window.document.removeEventListener("dblclick", onDoubleClick); + window.document.removeEventListener("dragover", onDragOver); + window.document.removeEventListener("drop", onDrop); + window.document.removeEventListener("dragleave", onDragLeave); + window.document.removeEventListener("keydown", onKeyDown); + if (config.isLPEditFeaturesActive) { // Initialize hover highlight with Chrome-like colors _hoverHighlight = new Highlight("#c8f9c5", true); // Green similar to Chrome's padding color @@ -3022,6 +3032,9 @@ function RemoteFunctions(config) { window.document.addEventListener("drop", onDrop); window.document.addEventListener("dragleave", onDragLeave); window.document.addEventListener("keydown", onKeyDown); + } else { + // Clean up any existing UI when edit features are disabled + dismissUIAndCleanupState(); } } diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index ce1c8ac27a..71618140ab 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -344,6 +344,7 @@ define(function main(require, exports, module) { config.isLPEditFeaturesActive = enabled; if (MultiBrowserLiveDev && MultiBrowserLiveDev.status >= MultiBrowserLiveDev.STATUS_ACTIVE) { MultiBrowserLiveDev.updateConfig(JSON.stringify(config)); + MultiBrowserLiveDev.registerHandlers(); } } diff --git a/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css b/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css index b75390a248..e69adf10a3 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css +++ b/src/extensionsIntegrated/Phoenix-live-preview/live-preview.css @@ -110,6 +110,7 @@ color: #a0a0a0; font-size: 14px; font-weight: normal; + padding: 0 0.75em; } #livePreviewModeBtn:hover { @@ -118,5 +119,15 @@ } #livePreviewModeBtn.btn-dropdown::after { - top: 9px !important; + position: static; + margin-top: 2px; + margin-left: 5px; +} + +#reloadLivePreviewButton { + margin-left: 3px; + margin-top: 3.5px; + width: 22px; + height: 22px; + flex-shrink: 0; } diff --git a/src/extensionsIntegrated/Phoenix-live-preview/main.js b/src/extensionsIntegrated/Phoenix-live-preview/main.js index dafc5ad162..fc4896d896 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/main.js +++ b/src/extensionsIntegrated/Phoenix-live-preview/main.js @@ -215,28 +215,42 @@ define(function (require, exports, module) { */ function _initializeMode() { const savedMode = PreferencesManager.get(PREFERENCE_LIVE_PREVIEW_MODE) || "preview"; + const isEditFeaturesActive = LiveDevelopment.isLPEditFeaturesActive; + + // If user has edit mode saved but edit features are not active, default to preview + let effectiveMode = savedMode; + if (savedMode === "edit" && !isEditFeaturesActive) { + effectiveMode = "preview"; + // Update the preference to reflect the actual mode being used + PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "preview"); + } - // apply the saved - if (savedMode === "highlight") { + // apply the effective mode + if (effectiveMode === "highlight") { _LPHighlightMode(); - } else if (savedMode === "edit") { + } else if (effectiveMode === "edit" && isEditFeaturesActive) { _LPEditMode(); } else { _LPPreviewMode(); } - _updateModeButton(savedMode); + _updateModeButton(effectiveMode); } function _showModeSelectionDropdown(event) { + const isEditFeaturesActive = LiveDevelopment.isLPEditFeaturesActive; const items = [ Strings.LIVE_PREVIEW_MODE_PREVIEW, Strings.LIVE_PREVIEW_MODE_HIGHLIGHT, - Strings.LIVE_PREVIEW_MODE_EDIT, - "---", - Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON + Strings.LIVE_PREVIEW_MODE_EDIT ]; + // Only add edit highlight option if edit features are active + if (isEditFeaturesActive) { + items.push("---"); + items.push(Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON); + } + const rawMode = PreferencesManager.get(PREFERENCE_LIVE_PREVIEW_MODE) || "preview"; // this is to take care of invalid values in the pref file const currentMode = ["preview", "highlight", "edit"].includes(rawMode) ? rawMode : "preview"; @@ -248,7 +262,12 @@ define(function (require, exports, module) { } else if (item === Strings.LIVE_PREVIEW_MODE_HIGHLIGHT) { return currentMode === "highlight" ? `✓ ${item}` : `${'\u00A0'.repeat(4)}${item}`; } else if (item === Strings.LIVE_PREVIEW_MODE_EDIT) { - return currentMode === "edit" ? `✓ ${item}` : `${'\u00A0'.repeat(4)}${item}`; + const checkmark = currentMode === "edit" ? "✓ " : `${'\u00A0'.repeat(4)}`; + const crownIcon = !isEditFeaturesActive ? ' Pro' : ''; + return { + html: `${checkmark}${item}${crownIcon}`, + enabled: isEditFeaturesActive + }; } else if (item === Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON) { const isHoverMode = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT) !== "click"; if(isHoverMode) { @@ -288,6 +307,10 @@ define(function (require, exports, module) { } else if (index === 2) { PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "edit"); } else if (item === Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON) { + // Don't allow edit highlight toggle if edit features are not active + if (!isEditFeaturesActive) { + return; + } // Toggle between hover and click const currentMode = PreferencesManager.get(PREFERENCE_PROJECT_ELEMENT_HIGHLIGHT); const newMode = currentMode !== "click" ? "click" : "hover"; @@ -984,16 +1007,26 @@ define(function (require, exports, module) { PreferencesManager.on("change", PREFERENCE_LIVE_PREVIEW_MODE, function () { // Get the current preference value directly const newMode = PreferencesManager.get(PREFERENCE_LIVE_PREVIEW_MODE); + const isEditFeaturesActive = LiveDevelopment.isLPEditFeaturesActive; + + // If user tries to set edit mode but edit features are not active, default to preview + let effectiveMode = newMode; + if (newMode === "edit" && !isEditFeaturesActive) { + effectiveMode = "preview"; + // Update the preference to reflect the actual mode being used + PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, "preview"); + return; // Return to avoid infinite loop + } - if (newMode === "highlight") { + if (effectiveMode === "highlight") { _LPHighlightMode(); - } else if (newMode === "edit") { + } else if (effectiveMode === "edit" && isEditFeaturesActive) { _LPEditMode(); } else { _LPPreviewMode(); } - _updateModeButton(newMode); + _updateModeButton(effectiveMode); }); // Handle element highlight preference changes from this extension diff --git a/src/extensionsIntegrated/Phoenix-live-preview/panel.html b/src/extensionsIntegrated/Phoenix-live-preview/panel.html index 39f73be028..625e4d6354 100644 --- a/src/extensionsIntegrated/Phoenix-live-preview/panel.html +++ b/src/extensionsIntegrated/Phoenix-live-preview/panel.html @@ -1,7 +1,8 @@
-
+
+
@@ -34,10 +35,9 @@
-
+
-
{{planName}}
diff --git a/src/services/login-browser.js b/src/services/login-browser.js index 336984f016..1c139b340d 100644 --- a/src/services/login-browser.js +++ b/src/services/login-browser.js @@ -413,6 +413,7 @@ define(function (require, exports, module) { secureExports.signOutAccount = signOutBrowser; secureExports.getProfile = getProfile; secureExports.verifyLoginStatus = () => _verifyBrowserLogin(false); + secureExports.getAccountBaseURL = _getAccountBaseURL; } // public exports diff --git a/src/services/login-desktop.js b/src/services/login-desktop.js index 4dfef4ee5a..b960d369d3 100644 --- a/src/services/login-desktop.js +++ b/src/services/login-desktop.js @@ -74,6 +74,14 @@ define(function (require, exports, module) { return userProfile; } + /** + * Get the account base URL for API calls + * For desktop apps, this directly uses the configured account URL + */ + function getAccountBaseURL() { + return Phoenix.config.account_url.replace(/\/$/, ''); // Remove trailing slash + } + const ERR_RETRY_LATER = "retry_later"; const ERR_INVALID = "invalid"; @@ -408,6 +416,7 @@ define(function (require, exports, module) { secureExports.signOutAccount = signOutAccount; secureExports.getProfile = getProfile; secureExports.verifyLoginStatus = () => _verifyLogin(false); + secureExports.getAccountBaseURL = getAccountBaseURL; } // public exports diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index aa10e15210..8da38fcfb1 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -1,6 +1,7 @@ define(function (require, exports, module) { const Mustache = require("thirdparty/mustache/mustache"), PopUpManager = require("widgets/PopUpManager"), + ThemeManager = require("view/ThemeManager"), Strings = require("strings"); const KernalModeTrust = window.KernalModeTrust; @@ -211,6 +212,78 @@ define(function (require, exports, module) { /* eslint-disable-next-line*/ customElements.define ('secure-name', SecureName); // space is must in define ( to prevent build fail + /** + * Load user details iframe with secure user information + */ + function _loadUserDetailsIframe() { + if (!Phoenix.isNativeApp && $popup) { + const $iframe = $popup.find("#user-details-frame"); + const $secureName = $popup.find(".user-name secure-name"); + const $secureEmail = $popup.find(".user-email secure-email"); + + if ($iframe.length) { + // Get account base URL for iframe using login service + const accountBaseURL = KernalModeTrust.loginService.getAccountBaseURL(); + const currentTheme = ThemeManager.getCurrentTheme(); + const nameColor = (currentTheme && currentTheme.dark) ? "FFFFFF" : "000000"; + + // Configure iframe URL with styling parameters + const iframeURL = `${accountBaseURL}/getUserDetailFrame?` + + `includeName=true&` + + `nameFontSize=14px&` + + `emailFontSize=12px&` + + `nameColor=%23${nameColor}&` + + `emailColor=%23666666&` + + `backgroundColor=transparent`; + + // Listen for iframe load events + const messageHandler = function(event) { + // Only accept messages from trusted account domain + // Handle proxy case where accountBaseURL is '/proxy/accounts' + let trustedOrigin; + if (accountBaseURL.startsWith('/proxy/accounts')) { + // For localhost with proxy, accept messages from current origin + trustedOrigin = window.location.origin; + } else { + // For production, get origin from account URL + trustedOrigin = new URL(accountBaseURL).origin; + } + + if (event.origin !== trustedOrigin) { + return; + } + + if (event.data && event.data.loaded) { + // Hide secure DOM elements and show iframe + $secureName.hide(); + $secureEmail.hide(); + $iframe.show(); + + // Adjust iframe height based on content + $iframe.css('height', '36px'); // Approximate height for name + email + + // Remove event listener + window.removeEventListener('message', messageHandler); + } + }; + + // Add message listener + window.addEventListener('message', messageHandler); + + // Set iframe source to load user details + $iframe.attr('src', iframeURL); + + // Fallback timeout - if iframe doesn't load in 5 seconds, keep secure elements + setTimeout(() => { + if ($iframe.is(':hidden')) { + console.log('User details iframe failed to load, keeping secure elements'); + window.removeEventListener('message', messageHandler); + } + }, 5000); + } + } + } + /** * Shows the user profile popup when the user is logged in */ @@ -271,6 +344,9 @@ define(function (require, exports, module) { }); _setupDocumentClickHandler(); + + // Load user details iframe for browser apps (after popup is created) + _loadUserDetailsIframe(); } /** diff --git a/src/services/readme-login-browser-no_dist.md b/src/services/readme-login-browser-no_dist.md index 87c8946fa4..85acca4f92 100644 --- a/src/services/readme-login-browser-no_dist.md +++ b/src/services/readme-login-browser-no_dist.md @@ -6,6 +6,11 @@ This document provides comprehensive documentation for integrating with the Phoe The Phoenix browser application uses a login service to authenticate users across the phcode.dev domain ecosystem. The login service handles user authentication, session management, and provides secure API endpoints for login operations. +**Key Features:** +- Domain-wide session management using session cookies +- Secure user profile display via iframe integration +- Proxy server support for localhost development + **Key Files:** - `src/services/login-browser.js` - Main browser login implementation - `serve-proxy.js` - Proxy server for localhost development @@ -122,9 +127,15 @@ The login service provides these key endpoints: ### Authentication - `POST /signOutPost` - Sign out user (new endpoint with proper JSON handling) -- `GET /resolveBrowserSession` - Validate and resolve current session +- `GET /resolveBrowserSession` - Validate and resolve current session (returns masked user data for security) - `GET /signOut` - Legacy signout endpoint (deprecated for browser use) +### User Profile Display +- `GET /getUserDetailFrame` - Returns HTML iframe with full user details for secure display + - Query parameters for styling: `includeName`, `nameFontSize`, `emailFontSize`, `nameColor`, `emailColor`, `backgroundColor` + - CSP-protected to only allow embedding in trusted domains + - Cross-origin communication via postMessage when loaded + ### Session Management - Session validation through `session` cookie - Automatic session invalidation on logout @@ -187,6 +198,12 @@ Browser (localhost:8000) → /proxy/accounts/* → serve-proxy.js - Session cookies should have appropriate expiration times - Logout should properly invalidate sessions on both client and server +### User Data Security +- **Masked API Data**: The `resolveBrowserSession` endpoint returns masked user data (e.g., "J***", "j***@g***.com") to prevent exposure to browser extensions +- **Secure iframe Display**: Full user details are displayed via iframe from trusted account server +- **CSP Protection**: iframe is protected by Content Security Policy headers restricting embedding domains +- **Cross-Origin Safety**: iframe communication uses secure postMessage protocol + --- -For browser implementation details, see the source code in `src/services/login-browser.js` and related files. For desktop authentication, see `src/services/login-desktop.js` and `readme-login-desktop-no_dist.md`. \ No newline at end of file +For browser implementation details, see the source code in `src/services/login-browser.js` and related files. For desktop authentication, see `src/services/login-desktop.js` and `readme-login-desktop-no_dist.md`. From 5de9263bc1a34e327bc7298206f0f699b9480516 Mon Sep 17 00:00:00 2001 From: abose Date: Sat, 30 Aug 2025 16:50:52 +0530 Subject: [PATCH 164/849] fix: in browser we get message welcome back, a*** on login --- src/nls/root/strings.js | 1 + src/services/login-browser.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index ed665e515b..c299818750 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1615,6 +1615,7 @@ define({ "CHECKING_STATUS": "Checking login status\u2026", "NOT_SIGNED_IN_YET": "Not signed in yet. Please complete sign-in in the other tab.", "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK_USER": "Welcome back, {0}!", "POPUP_BLOCKED": "Pop-up blocked. Please allow pop-ups and try again, or manually navigate to {0}", // Collapse Folders diff --git a/src/services/login-browser.js b/src/services/login-browser.js index 1c139b340d..8f0338dfba 100644 --- a/src/services/login-browser.js +++ b/src/services/login-browser.js @@ -268,8 +268,12 @@ define(function (require, exports, module) { function _onLoginSuccess() { if (loginWaitingDialog) { const $template = loginWaitingDialog.getElement(); + const welcomeBackMessage = Phoenix.isNativeApp ? + StringUtils.format(Strings.WELCOME_BACK_USER, userProfile.firstName): Strings.WELCOME_BACK; + // in desktop app, the apis return full username so we can show `Welcome back, alice`, but in + // browser app, we only get name like `a***` due to security posture, so we show `Welcome back` in browser. $template.find('#login-status') - .text(StringUtils.format(Strings.WELCOME_BACK, userProfile.firstName)) + .text(welcomeBackMessage) .css('color', '#10b981'); setTimeout(() => { _cancelLoginWaiting(); From 8b18e88f52cab0318ef09d8570c65d26834164f2 Mon Sep 17 00:00:00 2001 From: abose Date: Sat, 30 Aug 2025 16:53:39 +0530 Subject: [PATCH 165/849] fix: welcome back string typo --- src/nls/root/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index c299818750..78028bf314 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1614,7 +1614,7 @@ define({ "CHECKING": "Checking\u2026", "CHECKING_STATUS": "Checking login status\u2026", "NOT_SIGNED_IN_YET": "Not signed in yet. Please complete sign-in in the other tab.", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", "WELCOME_BACK_USER": "Welcome back, {0}!", "POPUP_BLOCKED": "Pop-up blocked. Please allow pop-ups and try again, or manually navigate to {0}", From 545a5756dcd3b2ad2b47e48d9a5cf6f76a65deac Mon Sep 17 00:00:00 2001 From: abose Date: Sat, 30 Aug 2025 15:31:58 +0000 Subject: [PATCH 166/849] ci: update Translations --- src/nls/ar/lastTranslated.json | 3 ++- src/nls/ar/strings.js | 21 +++++++++++---------- src/nls/bg/lastTranslated.json | 3 ++- src/nls/bg/strings.js | 21 +++++++++++---------- src/nls/cs/lastTranslated.json | 3 ++- src/nls/cs/strings.js | 21 +++++++++++---------- src/nls/da/lastTranslated.json | 3 ++- src/nls/da/strings.js | 21 +++++++++++---------- src/nls/de/lastTranslated.json | 3 ++- src/nls/de/strings.js | 21 +++++++++++---------- src/nls/el/lastTranslated.json | 3 ++- src/nls/el/strings.js | 21 +++++++++++---------- src/nls/en-gb/lastTranslated.json | 3 ++- src/nls/en-gb/strings.js | 21 +++++++++++---------- src/nls/es/lastTranslated.json | 3 ++- src/nls/es/strings.js | 21 +++++++++++---------- src/nls/fa-ir/lastTranslated.json | 3 ++- src/nls/fa-ir/strings.js | 21 +++++++++++---------- src/nls/fi/lastTranslated.json | 3 ++- src/nls/fi/strings.js | 21 +++++++++++---------- src/nls/fr/lastTranslated.json | 3 ++- src/nls/fr/strings.js | 21 +++++++++++---------- src/nls/gl/lastTranslated.json | 3 ++- src/nls/gl/strings.js | 21 +++++++++++---------- src/nls/hi/lastTranslated.json | 3 ++- src/nls/hi/strings.js | 21 +++++++++++---------- src/nls/hr/lastTranslated.json | 3 ++- src/nls/hr/strings.js | 21 +++++++++++---------- src/nls/hu/lastTranslated.json | 3 ++- src/nls/hu/strings.js | 21 +++++++++++---------- src/nls/id/lastTranslated.json | 3 ++- src/nls/id/strings.js | 21 +++++++++++---------- src/nls/it/lastTranslated.json | 3 ++- src/nls/it/strings.js | 21 +++++++++++---------- src/nls/ja/lastTranslated.json | 3 ++- src/nls/ja/strings.js | 21 +++++++++++---------- src/nls/ko/lastTranslated.json | 3 ++- src/nls/ko/strings.js | 21 +++++++++++---------- src/nls/lv/lastTranslated.json | 3 ++- src/nls/lv/strings.js | 21 +++++++++++---------- src/nls/ml/lastTranslated.json | 3 ++- src/nls/ml/strings.js | 21 +++++++++++---------- src/nls/nb/lastTranslated.json | 3 ++- src/nls/nb/strings.js | 21 +++++++++++---------- src/nls/nl/lastTranslated.json | 3 ++- src/nls/nl/strings.js | 21 +++++++++++---------- src/nls/pl/lastTranslated.json | 3 ++- src/nls/pl/strings.js | 21 +++++++++++---------- src/nls/pt-br/lastTranslated.json | 3 ++- src/nls/pt-br/strings.js | 21 +++++++++++---------- src/nls/pt-pt/lastTranslated.json | 3 ++- src/nls/pt-pt/strings.js | 21 +++++++++++---------- src/nls/ro/lastTranslated.json | 3 ++- src/nls/ro/strings.js | 21 +++++++++++---------- src/nls/ru/lastTranslated.json | 3 ++- src/nls/ru/strings.js | 21 +++++++++++---------- src/nls/sk/lastTranslated.json | 3 ++- src/nls/sk/strings.js | 21 +++++++++++---------- src/nls/sr/lastTranslated.json | 3 ++- src/nls/sr/strings.js | 21 +++++++++++---------- src/nls/sv/lastTranslated.json | 3 ++- src/nls/sv/strings.js | 21 +++++++++++---------- src/nls/tr/lastTranslated.json | 3 ++- src/nls/tr/strings.js | 21 +++++++++++---------- src/nls/uk/lastTranslated.json | 3 ++- src/nls/uk/strings.js | 21 +++++++++++---------- src/nls/ur/lastTranslated.json | 3 ++- src/nls/ur/strings.js | 21 +++++++++++---------- src/nls/zh-cn/lastTranslated.json | 3 ++- src/nls/zh-cn/strings.js | 21 +++++++++++---------- src/nls/zh-tw/lastTranslated.json | 3 ++- src/nls/zh-tw/strings.js | 21 +++++++++++---------- 72 files changed, 468 insertions(+), 396 deletions(-) diff --git a/src/nls/ar/lastTranslated.json b/src/nls/ar/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/ar/lastTranslated.json +++ b/src/nls/ar/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/ar/strings.js b/src/nls/ar/strings.js index d2d37d9da8..d298be2ac9 100644 --- a/src/nls/ar/strings.js +++ b/src/nls/ar/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "لا يمكن تسجيل الدخول", "SIGNED_IN_FAILED_MESSAGE": "حدث خطأ ما أثناء محاولة تسجيل الدخول. يُرجى المحاولة مرة أخرى.", "SIGNED_OUT_FAILED_TITLE": "فشل تسجيل الخروج", + "SIGNED_OUT_FAILED_MESSAGE": "حدث خطأ أثناء تسجيل الخروج. اضغط موافق لفتح account.phcode.dev حيث يمكنك تسجيل الخروج يدويًا.", "VALIDATION_CODE_TITLE": "رمز التحقق لتسجيل الدخول", "VALIDATION_CODE_MESSAGE": "الرجاء استخدام رمز التحقق هذا لتسجيل الدخول إلى حساب {APP_NAME} الخاص بك:", "COPY_VALIDATION_CODE": "نسخ الرمز", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "تفاصيل الحساب", "AI_QUOTA_USED": "حصة الذكاء الاصطناعي المستخدمة", "LOGIN_REFRESH": "تحقق من حالة تسجيل الدخول", + "SIGN_IN_WAITING_TITLE": "جارٍ انتظار تسجيل الدخول", + "SIGN_IN_WAITING_MESSAGE": "يُرجى إكمال تسجيل الدخول في علامة التبويب الجديدة، ثم العودة إلى هنا.", + "WAITING_FOR_LOGIN": "جارٍ انتظار تسجيل الدخول…", + "CHECK_NOW": "تحقق الآن", + "CHECKING": "جارٍ التحقق…", + "CHECKING_STATUS": "جارٍ التحقق من حالة تسجيل الدخول…", + "NOT_SIGNED_IN_YET": "لم يتم تسجيل الدخول بعد. يُرجى إكمال تسجيل الدخول في علامة التبويب الأخرى.", + "POPUP_BLOCKED": "تم حظر النافذة المنبثقة. يُرجى السماح بالنوافذ المنبثقة وإعادة المحاولة، أو الانتقال يدويًا إلى {0}", "COLLAPSE_ALL_FOLDERS": "طي جميع المجلدات", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "مقتطفات مخصصة…", "CUSTOM_SNIPPETS_PANEL_TITLE": "مقتطفات مخصصة", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "نص القالب", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "الوصف", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "امتداد الملف", - "SIGNED_OUT_FAILED_MESSAGE": "حدث خطأ أثناء تسجيل الخروج. اضغط موافق لفتح account.phcode.dev حيث يمكنك تسجيل الخروج يدويًا.", - "SIGN_IN_WAITING_TITLE": "جارٍ انتظار تسجيل الدخول", - "SIGN_IN_WAITING_MESSAGE": "يُرجى إكمال تسجيل الدخول في علامة التبويب الجديدة، ثم العودة إلى هنا.", - "WAITING_FOR_LOGIN": "جارٍ انتظار تسجيل الدخول…", - "CHECK_NOW": "تحقق الآن", - "CHECKING": "جارٍ التحقق…", - "CHECKING_STATUS": "جارٍ التحقق من حالة تسجيل الدخول…", - "NOT_SIGNED_IN_YET": "لم يتم تسجيل الدخول بعد. يُرجى إكمال تسجيل الدخول في علامة التبويب الأخرى.", - "WELCOME_BACK": "أهلاً بعودتك، {0}!", - "POPUP_BLOCKED": "تم حظر النافذة المنبثقة. يُرجى السماح بالنوافذ المنبثقة وإعادة المحاولة، أو الانتقال يدويًا إلى {0}" + "WELCOME_BACK": "أهلاً بعودتك", + "WELCOME_BACK_USER": "أهلاً بعودتك، {0}!" }); \ No newline at end of file diff --git a/src/nls/bg/lastTranslated.json b/src/nls/bg/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/bg/lastTranslated.json +++ b/src/nls/bg/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/bg/strings.js b/src/nls/bg/strings.js index 563ba4b050..beb02ec0b2 100644 --- a/src/nls/bg/strings.js +++ b/src/nls/bg/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Неуспешно влизане", "SIGNED_IN_FAILED_MESSAGE": "Възникна проблем при опит за влизане. Моля, опитайте отново.", "SIGNED_OUT_FAILED_TITLE": "Неуспешно излизане от профила", + "SIGNED_OUT_FAILED_MESSAGE": "Възникна проблем при излизане от профила. Натиснете OK, за да отворите account.phcode.dev, където можете да излезете ръчно.", "VALIDATION_CODE_TITLE": "Код за потвърждаване на вход", "VALIDATION_CODE_MESSAGE": "Моля, използвайте този код за потвърждение, за да влезете в своя {APP_NAME} акаунт:", "COPY_VALIDATION_CODE": "Копиране на код", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Данни за акаунта", "AI_QUOTA_USED": "Използвана AI квота", "LOGIN_REFRESH": "Проверка на състоянието за вход", + "SIGN_IN_WAITING_TITLE": "Изчакване за влизане", + "SIGN_IN_WAITING_MESSAGE": "Моля, завършете влизането в новия раздел и след това се върнете тук.", + "WAITING_FOR_LOGIN": "Изчакване за влизане…", + "CHECK_NOW": "Провери сега", + "CHECKING": "Проверява се…", + "CHECKING_STATUS": "Проверява се състоянието на влизане…", + "NOT_SIGNED_IN_YET": "Все още не сте влезли в профила си. Моля, завършете влизането в другия раздел.", + "POPUP_BLOCKED": "Изскачащият прозорец е блокиран. Моля, разрешете изскачащите прозорци и опитайте отново или отидете ръчно на {0}", "COLLAPSE_ALL_FOLDERS": "Свий всички папки", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Персонализирани фрагменти…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Персонализирани фрагменти", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст на шаблон", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Описание", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Разширение на файл", - "SIGNED_OUT_FAILED_MESSAGE": "Възникна проблем при излизане от профила. Натиснете OK, за да отворите account.phcode.dev, където можете да излезете ръчно.", - "SIGN_IN_WAITING_TITLE": "Изчакване за влизане", - "SIGN_IN_WAITING_MESSAGE": "Моля, завършете влизането в новия раздел и след това се върнете тук.", - "WAITING_FOR_LOGIN": "Изчакване за влизане…", - "CHECK_NOW": "Провери сега", - "CHECKING": "Проверява се…", - "CHECKING_STATUS": "Проверява се състоянието на влизане…", - "NOT_SIGNED_IN_YET": "Все още не сте влезли в профила си. Моля, завършете влизането в другия раздел.", - "WELCOME_BACK": "Добре дошли отново, {0}!", - "POPUP_BLOCKED": "Изскачащият прозорец е блокиран. Моля, разрешете изскачащите прозорци и опитайте отново или отидете ръчно на {0}" + "WELCOME_BACK": "Добре дошли отново", + "WELCOME_BACK_USER": "Добре дошли отново, {0}!" }); \ No newline at end of file diff --git a/src/nls/cs/lastTranslated.json b/src/nls/cs/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/cs/lastTranslated.json +++ b/src/nls/cs/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index 0f9dc86c39..56e796ceaa 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Nelze se přihlásit", "SIGNED_IN_FAILED_MESSAGE": "Při pokusu o přihlášení se něco pokazilo. Zkuste to prosím znovu.", "SIGNED_OUT_FAILED_TITLE": "Odhlášení se nezdařilo", + "SIGNED_OUT_FAILED_MESSAGE": "Při odhlašování se něco pokazilo. Stiskněte OK pro otevření stránky account.phcode.dev, kde se můžete odhlásit ručně.", "VALIDATION_CODE_TITLE": "Ověřovací kód pro přihlášení", "VALIDATION_CODE_MESSAGE": "Pro přihlášení k účtu {APP_NAME} použijte tento ověřovací kód:", "COPY_VALIDATION_CODE": "Kopírovat kód", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detaily účtu", "AI_QUOTA_USED": "Vyčerpána kvóta pro AI", "LOGIN_REFRESH": "Zkontrolovat stav přihlášení", + "SIGN_IN_WAITING_TITLE": "Čekání na přihlášení", + "SIGN_IN_WAITING_MESSAGE": "Dokončete prosím přihlášení v nové kartě a poté se sem vraťte.", + "WAITING_FOR_LOGIN": "Probíhá přihlašování…", + "CHECK_NOW": "Zkontrolovat", + "CHECKING": "Kontroluji…", + "CHECKING_STATUS": "Kontroluji stav přihlášení…", + "NOT_SIGNED_IN_YET": "Ještě nejste přihlášeni. Dokončete prosím přihlášení v druhé kartě.", + "POPUP_BLOCKED": "Vyskakovací okno bylo blokováno. Povolte prosím vyskakovací okna a zkuste to znovu, nebo přejděte ručně na {0}", "COLLAPSE_ALL_FOLDERS": "Sbalit všechny složky", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Vlastní úryvky…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Vlastní úryvky", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text šablony", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Popis", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Přípona souboru", - "SIGNED_OUT_FAILED_MESSAGE": "Při odhlašování se něco pokazilo. Stiskněte OK pro otevření stránky account.phcode.dev, kde se můžete odhlásit ručně.", - "SIGN_IN_WAITING_TITLE": "Čekání na přihlášení", - "SIGN_IN_WAITING_MESSAGE": "Dokončete prosím přihlášení v nové kartě a poté se sem vraťte.", - "WAITING_FOR_LOGIN": "Probíhá přihlašování…", - "CHECK_NOW": "Zkontrolovat", - "CHECKING": "Kontroluji…", - "CHECKING_STATUS": "Kontroluji stav přihlášení…", - "NOT_SIGNED_IN_YET": "Ještě nejste přihlášeni. Dokončete prosím přihlášení v druhé kartě.", - "WELCOME_BACK": "Vítejte zpět, {0}!", - "POPUP_BLOCKED": "Vyskakovací okno bylo blokováno. Povolte prosím vyskakovací okna a zkuste to znovu, nebo přejděte ručně na {0}" + "WELCOME_BACK": "Vítejte zpět", + "WELCOME_BACK_USER": "Vítejte zpět, {0}!" }); \ No newline at end of file diff --git a/src/nls/da/lastTranslated.json b/src/nls/da/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/da/lastTranslated.json +++ b/src/nls/da/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/da/strings.js b/src/nls/da/strings.js index 2a44fcfd3a..b445c27021 100644 --- a/src/nls/da/strings.js +++ b/src/nls/da/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Kan ikke logge ind", "SIGNED_IN_FAILED_MESSAGE": "Der gik noget galt under forsøget på at logge ind. Prøv igen.", "SIGNED_OUT_FAILED_TITLE": "Kunne ikke logge ud", + "SIGNED_OUT_FAILED_MESSAGE": "Der opstod en fejl under udlogning. Tryk OK for at åbne account.phcode.dev, hvor du kan logge ud manuelt.", "VALIDATION_CODE_TITLE": "Bekræftelseskode", "VALIDATION_CODE_MESSAGE": "Brug venligst denne bekræftelseskode til at logge ind på din {APP_NAME}-konto:", "COPY_VALIDATION_CODE": "Kopiér kode", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Kontooplysninger", "AI_QUOTA_USED": "Brugt AI-kvote", "LOGIN_REFRESH": "Tjek loginstatus", + "SIGN_IN_WAITING_TITLE": "Venter på login", + "SIGN_IN_WAITING_MESSAGE": "Fuldfør venligst login i den nye fane, og vend derefter tilbage hertil.", + "WAITING_FOR_LOGIN": "Venter på login…", + "CHECK_NOW": "Tjek nu", + "CHECKING": "Tjekker…", + "CHECKING_STATUS": "Tjekker loginstatus…", + "NOT_SIGNED_IN_YET": "Du er ikke logget ind endnu. Fuldfør venligst login i den anden fane.", + "POPUP_BLOCKED": "Pop-up blokeret. Tillad venligst pop-ups, og prøv igen, eller gå manuelt til {0}", "COLLAPSE_ALL_FOLDERS": "Skjul alle mapper", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Brugerdefinerede snippets…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Brugerdefinerede snippets", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Skabelontekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivelse", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtypenavn", - "SIGNED_OUT_FAILED_MESSAGE": "Der opstod en fejl under udlogning. Tryk OK for at åbne account.phcode.dev, hvor du kan logge ud manuelt.", - "SIGN_IN_WAITING_TITLE": "Venter på login", - "SIGN_IN_WAITING_MESSAGE": "Fuldfør venligst login i den nye fane, og vend derefter tilbage hertil.", - "WAITING_FOR_LOGIN": "Venter på login…", - "CHECK_NOW": "Tjek nu", - "CHECKING": "Tjekker…", - "CHECKING_STATUS": "Tjekker loginstatus…", - "NOT_SIGNED_IN_YET": "Du er ikke logget ind endnu. Fuldfør venligst login i den anden fane.", - "WELCOME_BACK": "Velkommen tilbage, {0}!", - "POPUP_BLOCKED": "Pop-up blokeret. Tillad venligst pop-ups, og prøv igen, eller gå manuelt til {0}" + "WELCOME_BACK": "Velkommen tilbage", + "WELCOME_BACK_USER": "Velkommen tilbage, {0}!" }); \ No newline at end of file diff --git a/src/nls/de/lastTranslated.json b/src/nls/de/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/de/lastTranslated.json +++ b/src/nls/de/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 72c3a8b617..92a474005b 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Anmeldung nicht möglich", "SIGNED_IN_FAILED_MESSAGE": "Bei der Anmeldung ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.", "SIGNED_OUT_FAILED_TITLE": "Abmeldung fehlgeschlagen", + "SIGNED_OUT_FAILED_MESSAGE": "Beim Abmelden ist ein Fehler aufgetreten. Klicken Sie auf OK, um account.phcode.dev zu öffnen, wo Sie sich manuell abmelden können.", "VALIDATION_CODE_TITLE": "Bestätigungscode für die Anmeldung", "VALIDATION_CODE_MESSAGE": "Bitte verwenden Sie diesen Bestätigungscode, um sich bei Ihrem {APP_NAME}-Konto anzumelden:", "COPY_VALIDATION_CODE": "Code kopieren", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Kontodetails", "AI_QUOTA_USED": "Verbrauchte KI-Quote", "LOGIN_REFRESH": "Anmeldestatus überprüfen", + "SIGN_IN_WAITING_TITLE": "Warte auf Anmeldung", + "SIGN_IN_WAITING_MESSAGE": "Bitte schließen Sie die Anmeldung im neuen Tab ab und kehren Sie dann hierher zurück.", + "WAITING_FOR_LOGIN": "Warte auf Anmeldung…", + "CHECK_NOW": "Jetzt prüfen", + "CHECKING": "Überprüfung läuft…", + "CHECKING_STATUS": "Anmeldestatus wird überprüft…", + "NOT_SIGNED_IN_YET": "Sie sind noch nicht angemeldet. Bitte schließen Sie die Anmeldung im anderen Tab ab.", + "POPUP_BLOCKED": "Popup blockiert. Bitte erlauben Sie Popups und versuchen Sie es erneut, oder navigieren Sie manuell zu {0}", "COLLAPSE_ALL_FOLDERS": "Alle Ordner zuklappen", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Benutzerdefinierte Snippets…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Benutzerdefinierte Snippets", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Vorlagentext", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beschreibung", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dateierweiterung", - "SIGNED_OUT_FAILED_MESSAGE": "Beim Abmelden ist ein Fehler aufgetreten. Klicken Sie auf OK, um account.phcode.dev zu öffnen, wo Sie sich manuell abmelden können.", - "SIGN_IN_WAITING_TITLE": "Warte auf Anmeldung", - "SIGN_IN_WAITING_MESSAGE": "Bitte schließen Sie die Anmeldung im neuen Tab ab und kehren Sie dann hierher zurück.", - "WAITING_FOR_LOGIN": "Warte auf Anmeldung…", - "CHECK_NOW": "Jetzt prüfen", - "CHECKING": "Überprüfung läuft…", - "CHECKING_STATUS": "Anmeldestatus wird überprüft…", - "NOT_SIGNED_IN_YET": "Sie sind noch nicht angemeldet. Bitte schließen Sie die Anmeldung im anderen Tab ab.", - "WELCOME_BACK": "Willkommen zurück, {0}!", - "POPUP_BLOCKED": "Popup blockiert. Bitte erlauben Sie Popups und versuchen Sie es erneut, oder navigieren Sie manuell zu {0}" + "WELCOME_BACK": "Willkommen zurück", + "WELCOME_BACK_USER": "Willkommen zurück, {0}!" }); \ No newline at end of file diff --git a/src/nls/el/lastTranslated.json b/src/nls/el/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/el/lastTranslated.json +++ b/src/nls/el/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/el/strings.js b/src/nls/el/strings.js index 2816343a3a..28f4427023 100644 --- a/src/nls/el/strings.js +++ b/src/nls/el/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Δεν είναι δυνατή η σύνδεση", "SIGNED_IN_FAILED_MESSAGE": "Κάτι πήγε στραβά κατά την προσπάθεια σύνδεσης. Παρακαλούμε δοκιμάστε ξανά.", "SIGNED_OUT_FAILED_TITLE": "Αποτυχία αποσύνδεσης", + "SIGNED_OUT_FAILED_MESSAGE": "Παρουσιάστηκε πρόβλημα κατά την αποσύνδεση. Πατήστε OK για να ανοίξετε account.phcode.dev όπου μπορείτε να αποσυνδεθείτε χειροκίνητα.", "VALIDATION_CODE_TITLE": "Κωδικός Επαλήθευσης Σύνδεσης", "VALIDATION_CODE_MESSAGE": "Χρησιμοποιήστε αυτόν τον κωδικό επαλήθευσης για να συνδεθείτε στον λογαριασμό σας στο {APP_NAME}:", "COPY_VALIDATION_CODE": "Αντιγραφή Κωδικού", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Στοιχεία Λογαριασμού", "AI_QUOTA_USED": "Χρήση ποσοστού AI", "LOGIN_REFRESH": "Έλεγχος Κατάστασης Σύνδεσης", + "SIGN_IN_WAITING_TITLE": "Αναμονή για Σύνδεση", + "SIGN_IN_WAITING_MESSAGE": "Ολοκληρώστε τη σύνδεση στην νέα καρτέλα και μετά επιστρέψτε εδώ.", + "WAITING_FOR_LOGIN": "Αναμονή για σύνδεση…", + "CHECK_NOW": "Έλεγχος Τώρα", + "CHECKING": "Έλεγχος…", + "CHECKING_STATUS": "Έλεγχος κατάστασης σύνδεσης…", + "NOT_SIGNED_IN_YET": "Δεν έχετε συνδεθεί ακόμα. Παρακαλούμε ολοκληρώστε τη σύνδεση στην άλλη καρτέλα.", + "POPUP_BLOCKED": "Το αναδυόμενο παράθυρο μπλοκαρίστηκε. Επιτρέψτε τα αναδυόμενα παράθυρα και προσπαθήστε ξανά ή μεταβείτε χειροκίνητα στο {0}", "COLLAPSE_ALL_FOLDERS": "Σύμπτυξη Όλων των Φακέλων", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Προσαρμοσμένα αποσπάσματα…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Προσαρμοσμένα αποσπάσματα", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Κείμενο Προτύπου", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Περιγραφή", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Επέκταση Αρχείου", - "SIGNED_OUT_FAILED_MESSAGE": "Παρουσιάστηκε πρόβλημα κατά την αποσύνδεση. Πατήστε OK για να ανοίξετε account.phcode.dev όπου μπορείτε να αποσυνδεθείτε χειροκίνητα.", - "SIGN_IN_WAITING_TITLE": "Αναμονή για Σύνδεση", - "SIGN_IN_WAITING_MESSAGE": "Ολοκληρώστε τη σύνδεση στην νέα καρτέλα και μετά επιστρέψτε εδώ.", - "WAITING_FOR_LOGIN": "Αναμονή για σύνδεση…", - "CHECK_NOW": "Έλεγχος Τώρα", - "CHECKING": "Έλεγχος…", - "CHECKING_STATUS": "Έλεγχος κατάστασης σύνδεσης…", - "NOT_SIGNED_IN_YET": "Δεν έχετε συνδεθεί ακόμα. Παρακαλούμε ολοκληρώστε τη σύνδεση στην άλλη καρτέλα.", - "WELCOME_BACK": "Καλώς ήρθατε πίσω, {0}!", - "POPUP_BLOCKED": "Το αναδυόμενο παράθυρο μπλοκαρίστηκε. Επιτρέψτε τα αναδυόμενα παράθυρα και προσπαθήστε ξανά ή μεταβείτε χειροκίνητα στο {0}" + "WELCOME_BACK": "Καλώς ορίσατε πίσω", + "WELCOME_BACK_USER": "Καλώς ορίσατε πίσω, {0}!" }); \ No newline at end of file diff --git a/src/nls/en-gb/lastTranslated.json b/src/nls/en-gb/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/en-gb/lastTranslated.json +++ b/src/nls/en-gb/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/en-gb/strings.js b/src/nls/en-gb/strings.js index 139e396313..33bbfb8ed9 100644 --- a/src/nls/en-gb/strings.js +++ b/src/nls/en-gb/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Can't Sign In", "SIGNED_IN_FAILED_MESSAGE": "Something went wrong while trying to sign in. Please try again.", "SIGNED_OUT_FAILED_TITLE": "Failed to Sign Out", + "SIGNED_OUT_FAILED_MESSAGE": "Something went wrong while logging out. Press OK to open account.phcode.dev where you can log out manually.", "VALIDATION_CODE_TITLE": "Sign In Verification Code", "VALIDATION_CODE_MESSAGE": "Please use this verification code to sign in to your {APP_NAME} account:", "COPY_VALIDATION_CODE": "Copy Code", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Account Details", "AI_QUOTA_USED": "AI quota used", "LOGIN_REFRESH": "Check Login Status", + "SIGN_IN_WAITING_TITLE": "Waiting for Sign-in", + "SIGN_IN_WAITING_MESSAGE": "Please complete sign-in in the new tab, then return here.", + "WAITING_FOR_LOGIN": "Waiting for login…", + "CHECK_NOW": "Check now", + "CHECKING": "Checking…", + "CHECKING_STATUS": "Checking login status…", + "NOT_SIGNED_IN_YET": "Not signed in yet. Please complete sign-in in the other tab.", + "POPUP_BLOCKED": "Pop-up blocked. Please allow pop-ups and try again, or manually navigate to {0}", "COLLAPSE_ALL_FOLDERS": "Collapse all folders", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Custom Snippets…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Custom Snippets", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Template Text", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "File Extension", - "SIGNED_OUT_FAILED_MESSAGE": "Something went wrong while logging out. Press OK to open account.phcode.dev where you can log out manually.", - "SIGN_IN_WAITING_TITLE": "Waiting for Sign-in", - "SIGN_IN_WAITING_MESSAGE": "Please complete sign-in in the new tab, then return here.", - "WAITING_FOR_LOGIN": "Waiting for login…", - "CHECK_NOW": "Check now", - "CHECKING": "Checking…", - "CHECKING_STATUS": "Checking login status…", - "NOT_SIGNED_IN_YET": "Not signed in yet. Please complete sign-in in the other tab.", - "WELCOME_BACK": "Welcome back, {0}!", - "POPUP_BLOCKED": "Pop-up blocked. Please allow pop-ups and try again, or manually navigate to {0}" + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!" }); \ No newline at end of file diff --git a/src/nls/es/lastTranslated.json b/src/nls/es/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/es/lastTranslated.json +++ b/src/nls/es/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/es/strings.js b/src/nls/es/strings.js index 186fb17686..fb2e3d6f0d 100644 --- a/src/nls/es/strings.js +++ b/src/nls/es/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "No se puede iniciar sesión", "SIGNED_IN_FAILED_MESSAGE": "Algo salió mal al intentar iniciar sesión. Inténtalo de nuevo.", "SIGNED_OUT_FAILED_TITLE": "Error al cerrar sesión", + "SIGNED_OUT_FAILED_MESSAGE": "Algo salió mal al cerrar sesión. Pulsa Aceptar para abrir account.phcode.dev donde puedes cerrar sesión manualmente.", "VALIDATION_CODE_TITLE": "Código de verificación de inicio de sesión", "VALIDATION_CODE_MESSAGE": "Usa este código de verificación para iniciar sesión en tu cuenta de {APP_NAME}:", "COPY_VALIDATION_CODE": "Copiar código", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detalles de la cuenta", "AI_QUOTA_USED": "Cuota de IA utilizada", "LOGIN_REFRESH": "Verificar estado del inicio de sesión", + "SIGN_IN_WAITING_TITLE": "Esperando inicio de sesión", + "SIGN_IN_WAITING_MESSAGE": "Completa el inicio de sesión en la nueva pestaña y luego regresa aquí.", + "WAITING_FOR_LOGIN": "Esperando el inicio de sesión…", + "CHECK_NOW": "Verificar ahora", + "CHECKING": "Verificando…", + "CHECKING_STATUS": "Comprobando el estado del inicio de sesión…", + "NOT_SIGNED_IN_YET": "Aún no has iniciado sesión. Completa el inicio de sesión en la otra pestaña.", + "POPUP_BLOCKED": "Ventana emergente bloqueada. Permite las ventanas emergentes e inténtalo de nuevo, o navega manualmente a {0}", "COLLAPSE_ALL_FOLDERS": "Contraer todas las carpetas", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Fragmentos de código personalizados…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Fragmentos de código personalizados", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto de la plantilla", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descripción", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de archivo", - "SIGNED_OUT_FAILED_MESSAGE": "Algo salió mal al cerrar sesión. Pulsa Aceptar para abrir account.phcode.dev donde puedes cerrar sesión manualmente.", - "SIGN_IN_WAITING_TITLE": "Esperando inicio de sesión", - "SIGN_IN_WAITING_MESSAGE": "Completa el inicio de sesión en la nueva pestaña y luego regresa aquí.", - "WAITING_FOR_LOGIN": "Esperando el inicio de sesión…", - "CHECK_NOW": "Verificar ahora", - "CHECKING": "Verificando…", - "CHECKING_STATUS": "Comprobando el estado del inicio de sesión…", - "NOT_SIGNED_IN_YET": "Aún no has iniciado sesión. Completa el inicio de sesión en la otra pestaña.", - "WELCOME_BACK": "¡Bienvenido de nuevo, {0}!", - "POPUP_BLOCKED": "Ventana emergente bloqueada. Permite las ventanas emergentes e inténtalo de nuevo, o navega manualmente a {0}" + "WELCOME_BACK": "Bienvenido de nuevo", + "WELCOME_BACK_USER": "¡Bienvenido de nuevo, {0}!" }); \ No newline at end of file diff --git a/src/nls/fa-ir/lastTranslated.json b/src/nls/fa-ir/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/fa-ir/lastTranslated.json +++ b/src/nls/fa-ir/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index e67970b6b6..7919ca40bc 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "امکان ورود وجود ندارد", "SIGNED_IN_FAILED_MESSAGE": "هنگام ورود مشکلی پیش آمد. لطفاً دوباره امتحان کنید.", "SIGNED_OUT_FAILED_TITLE": "خروج از حساب کاربری ناموفق بود", + "SIGNED_OUT_FAILED_MESSAGE": "در هنگام خروج مشکلی پیش آمد. برای باز کردن account.phcode.dev که می‌توانید به صورت دستی از آنجا خارج شوید، روی تأیید کلیک کنید.", "VALIDATION_CODE_TITLE": "کد تایید ورود", "VALIDATION_CODE_MESSAGE": "لطفا از این کد تایید برای ورود به حساب {APP_NAME} خود استفاده کنید:", "COPY_VALIDATION_CODE": "کپی کد", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "جزئیات حساب کاربری", "AI_QUOTA_USED": "سهمیه هوش مصنوعی استفاده شده", "LOGIN_REFRESH": "بررسی وضعیت ورود", + "SIGN_IN_WAITING_TITLE": "در حال انتظار برای ورود", + "SIGN_IN_WAITING_MESSAGE": "لطفاً ورود به سیستم را در برگه جدید تکمیل کنید، سپس به اینجا برگردید.", + "WAITING_FOR_LOGIN": "در حال انتظار برای ورود…", + "CHECK_NOW": "بررسی کن", + "CHECKING": "در حال بررسی…", + "CHECKING_STATUS": "در حال بررسی وضعیت ورود…", + "NOT_SIGNED_IN_YET": "هنوز وارد سیستم نشده‌اید. لطفاً ورود به سیستم را در برگه دیگر تکمیل کنید.", + "POPUP_BLOCKED": "پنجره‌ی پاپ‌آپ مسدود شده است. لطفاً اجازه نمایش پنجره‌های پاپ‌آپ را بدهید و دوباره امتحان کنید، یا به صورت دستی به {0} بروید.", "COLLAPSE_ALL_FOLDERS": "بستن همهٔ پوشه‌ها", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "قطعه‌کدهای سفارشی…", "CUSTOM_SNIPPETS_PANEL_TITLE": "قطعه‌کدهای سفارشی", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "متن الگو", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "توضیحات", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "پسوند فایل", - "SIGNED_OUT_FAILED_MESSAGE": "در هنگام خروج مشکلی پیش آمد. برای باز کردن account.phcode.dev که می‌توانید به صورت دستی از آنجا خارج شوید، روی تأیید کلیک کنید.", - "SIGN_IN_WAITING_TITLE": "در حال انتظار برای ورود", - "SIGN_IN_WAITING_MESSAGE": "لطفاً ورود به سیستم را در برگه جدید تکمیل کنید، سپس به اینجا برگردید.", - "WAITING_FOR_LOGIN": "در حال انتظار برای ورود…", - "CHECK_NOW": "بررسی کن", - "CHECKING": "در حال بررسی…", - "CHECKING_STATUS": "در حال بررسی وضعیت ورود…", - "NOT_SIGNED_IN_YET": "هنوز وارد سیستم نشده‌اید. لطفاً ورود به سیستم را در برگه دیگر تکمیل کنید.", - "WELCOME_BACK": "{0} خوش برگشتی!", - "POPUP_BLOCKED": "پنجره‌ی پاپ‌آپ مسدود شده است. لطفاً اجازه نمایش پنجره‌های پاپ‌آپ را بدهید و دوباره امتحان کنید، یا به صورت دستی به {0} بروید." + "WELCOME_BACK": "خوش آمدید", + "WELCOME_BACK_USER": "{0} عزیز، خوش آمدید!" }); \ No newline at end of file diff --git a/src/nls/fi/lastTranslated.json b/src/nls/fi/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/fi/lastTranslated.json +++ b/src/nls/fi/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js index 09fb3afe24..744edb9f9b 100644 --- a/src/nls/fi/strings.js +++ b/src/nls/fi/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Kirjautuminen ei onnistu", "SIGNED_IN_FAILED_MESSAGE": "Kirjautumisessa tapahtui virhe. Yritä uudelleen.", "SIGNED_OUT_FAILED_TITLE": "Uloskirjautuminen epäonnistui", + "SIGNED_OUT_FAILED_MESSAGE": "Uloskirjautumisessa tapahtui virhe. Paina OK avataksesi account.phcode.dev -sivuston, josta voit kirjautua ulos manuaalisesti.", "VALIDATION_CODE_TITLE": "Vahvistuskoodi", "VALIDATION_CODE_MESSAGE": "Käytä tätä vahvistuskoodia kirjautuaksesi {APP_NAME}-tilillesi:", "COPY_VALIDATION_CODE": "Kopioi koodi", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Tilin tiedot", "AI_QUOTA_USED": "Käytetty tekoälykiintiö", "LOGIN_REFRESH": "Tarkista kirjautumistila", + "SIGN_IN_WAITING_TITLE": "Kirjaudutaan sisään", + "SIGN_IN_WAITING_MESSAGE": "Viimeistele sisäänkirjautuminen uudessa välilehdessä ja palaa sitten tänne.", + "WAITING_FOR_LOGIN": "Kirjaudutaan sisään…", + "CHECK_NOW": "Tarkista nyt", + "CHECKING": "Tarkistetaan…", + "CHECKING_STATUS": "Tarkistetaan kirjautumistilaa…", + "NOT_SIGNED_IN_YET": "Et ole vielä kirjautunut sisään. Viimeistele sisäänkirjautuminen toisessa välilehdessä.", + "POPUP_BLOCKED": "Ponnahdusikkuna estetty. Salli ponnahdusikkunat ja yritä uudelleen tai siirry manuaalisesti osoitteeseen {0}", "COLLAPSE_ALL_FOLDERS": "Sulje kaikki kansiot", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Omat koodinpätkät…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Omat koodinpätkät", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Malliteksti", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Kuvaus", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Tiedostopääte", - "SIGNED_OUT_FAILED_MESSAGE": "Uloskirjautumisessa tapahtui virhe. Paina OK avataksesi account.phcode.dev -sivuston, josta voit kirjautua ulos manuaalisesti.", - "SIGN_IN_WAITING_TITLE": "Kirjaudutaan sisään", - "SIGN_IN_WAITING_MESSAGE": "Viimeistele sisäänkirjautuminen uudessa välilehdessä ja palaa sitten tänne.", - "WAITING_FOR_LOGIN": "Kirjaudutaan sisään…", - "CHECK_NOW": "Tarkista nyt", - "CHECKING": "Tarkistetaan…", - "CHECKING_STATUS": "Tarkistetaan kirjautumistilaa…", - "NOT_SIGNED_IN_YET": "Et ole vielä kirjautunut sisään. Viimeistele sisäänkirjautuminen toisessa välilehdessä.", - "WELCOME_BACK": "Tervetuloa takaisin, {0}!", - "POPUP_BLOCKED": "Ponnahdusikkuna estetty. Salli ponnahdusikkunat ja yritä uudelleen tai siirry manuaalisesti osoitteeseen {0}" + "WELCOME_BACK": "Tervetuloa takaisin", + "WELCOME_BACK_USER": "Tervetuloa takaisin, {0}!" }); \ No newline at end of file diff --git a/src/nls/fr/lastTranslated.json b/src/nls/fr/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/fr/lastTranslated.json +++ b/src/nls/fr/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index 86839b8d19..64a6cd3b21 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Connexion impossible", "SIGNED_IN_FAILED_MESSAGE": "Un problème est survenu lors de la connexion. Veuillez réessayer.", "SIGNED_OUT_FAILED_TITLE": "Déconnexion impossible", + "SIGNED_OUT_FAILED_MESSAGE": "Une erreur s'est produite lors de la déconnexion. Cliquez sur OK pour ouvrir account.phcode.dev où vous pouvez vous déconnecter manuellement.", "VALIDATION_CODE_TITLE": "Code de vérification de connexion", "VALIDATION_CODE_MESSAGE": "Veuillez utiliser ce code de vérification pour vous connecter à votre compte {APP_NAME} :", "COPY_VALIDATION_CODE": "Copier le code", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Détails du compte", "AI_QUOTA_USED": "Quota IA utilisé", "LOGIN_REFRESH": "Vérifier l'état de la connexion", + "SIGN_IN_WAITING_TITLE": "En attente de connexion", + "SIGN_IN_WAITING_MESSAGE": "Veuillez vous connecter dans le nouvel onglet, puis revenez ici.", + "WAITING_FOR_LOGIN": "Connexion en cours…", + "CHECK_NOW": "Vérifier maintenant", + "CHECKING": "Vérification…", + "CHECKING_STATUS": "Vérification de l'état de la connexion…", + "NOT_SIGNED_IN_YET": "Vous n'êtes pas encore connecté. Veuillez vous connecter dans l'autre onglet.", + "POPUP_BLOCKED": "Fenêtre contextuelle bloquée. Veuillez autoriser les fenêtres contextuelles et réessayer, ou accédez manuellement à {0}", "COLLAPSE_ALL_FOLDERS": "Réduire tous les dossiers", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Extraits personnalisés…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Extraits personnalisés", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texte du modèle", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extension de fichier", - "SIGNED_OUT_FAILED_MESSAGE": "Une erreur s'est produite lors de la déconnexion. Cliquez sur OK pour ouvrir account.phcode.dev où vous pouvez vous déconnecter manuellement.", - "SIGN_IN_WAITING_TITLE": "En attente de connexion", - "SIGN_IN_WAITING_MESSAGE": "Veuillez vous connecter dans le nouvel onglet, puis revenez ici.", - "WAITING_FOR_LOGIN": "Connexion en cours…", - "CHECK_NOW": "Vérifier maintenant", - "CHECKING": "Vérification…", - "CHECKING_STATUS": "Vérification de l'état de la connexion…", - "NOT_SIGNED_IN_YET": "Vous n'êtes pas encore connecté. Veuillez vous connecter dans l'autre onglet.", - "WELCOME_BACK": "Bon retour parmi nous, {0} !", - "POPUP_BLOCKED": "Fenêtre contextuelle bloquée. Veuillez autoriser les fenêtres contextuelles et réessayer, ou accédez manuellement à {0}" + "WELCOME_BACK": "Bon retour", + "WELCOME_BACK_USER": "Bon retour, {0} !" }); \ No newline at end of file diff --git a/src/nls/gl/lastTranslated.json b/src/nls/gl/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/gl/lastTranslated.json +++ b/src/nls/gl/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/gl/strings.js b/src/nls/gl/strings.js index eb14b92044..8fddcf6a28 100644 --- a/src/nls/gl/strings.js +++ b/src/nls/gl/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Non se pode iniciar sesión", "SIGNED_IN_FAILED_MESSAGE": "Algo fallou ao tentar iniciar sesión. Inténteo de novo.", "SIGNED_OUT_FAILED_TITLE": "Non se puido pechar a sesión", + "SIGNED_OUT_FAILED_MESSAGE": "Houbo un problema ao pechar a sesión. Prema Aceptar para abrir account.phcode.dev onde pode pechar a sesión manualmente.", "VALIDATION_CODE_TITLE": "Código de verificación de inicio de sesión", "VALIDATION_CODE_MESSAGE": "Utiliza este código de verificación para iniciar sesión na túa conta de {APP_NAME}:", "COPY_VALIDATION_CODE": "Copiar código", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detalles da conta", "AI_QUOTA_USED": "Cota de IA usada", "LOGIN_REFRESH": "Comprobar o estado do inicio de sesión", + "SIGN_IN_WAITING_TITLE": "Agardando o inicio de sesión", + "SIGN_IN_WAITING_MESSAGE": "Complete o inicio de sesión na nova lapela e logo volva aquí.", + "WAITING_FOR_LOGIN": "Agardando o inicio de sesión…", + "CHECK_NOW": "Comprobar agora", + "CHECKING": "Comprobando…", + "CHECKING_STATUS": "Comprobando o estado do inicio de sesión…", + "NOT_SIGNED_IN_YET": "Aínda non iniciou sesión. Complete o inicio de sesión na outra lapela.", + "POPUP_BLOCKED": "Ventá emerxente bloqueada. Permite as ventás emerxentes e ténteo de novo ou navega manualmente a {0}", "COLLAPSE_ALL_FOLDERS": "Contraer todas as carpetas", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Fragmentos personalizados…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Fragmentos personalizados", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrición", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de ficheiro", - "SIGNED_OUT_FAILED_MESSAGE": "Houbo un problema ao pechar a sesión. Prema Aceptar para abrir account.phcode.dev onde pode pechar a sesión manualmente.", - "SIGN_IN_WAITING_TITLE": "Agardando o inicio de sesión", - "SIGN_IN_WAITING_MESSAGE": "Complete o inicio de sesión na nova lapela e logo volva aquí.", - "WAITING_FOR_LOGIN": "Agardando o inicio de sesión…", - "CHECK_NOW": "Comprobar agora", - "CHECKING": "Comprobando…", - "CHECKING_STATUS": "Comprobando o estado do inicio de sesión…", - "NOT_SIGNED_IN_YET": "Aínda non iniciou sesión. Complete o inicio de sesión na outra lapela.", - "WELCOME_BACK": "Benvido de volta, {0}!", - "POPUP_BLOCKED": "Ventá emerxente bloqueada. Permite as ventás emerxentes e ténteo de novo ou navega manualmente a {0}" + "WELCOME_BACK": "Benvido de volta", + "WELCOME_BACK_USER": "Benvido de volta, {0}!" }); \ No newline at end of file diff --git a/src/nls/hi/lastTranslated.json b/src/nls/hi/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/hi/lastTranslated.json +++ b/src/nls/hi/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/hi/strings.js b/src/nls/hi/strings.js index c87eb46186..1905623444 100644 --- a/src/nls/hi/strings.js +++ b/src/nls/hi/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "साइन इन नहीं कर सकते", "SIGNED_IN_FAILED_MESSAGE": "साइन इन करने का प्रयास करते समय कुछ गड़बड़ हो गई। कृपया पुनः प्रयास करें।", "SIGNED_OUT_FAILED_TITLE": "साइन आउट करने में विफल", + "SIGNED_OUT_FAILED_MESSAGE": "लॉग आउट करते समय कुछ गड़बड़ हो गई। account.phcode.dev खोलने के लिए ठीक दबाएँ, जहाँ आप मैन्युअल रूप से लॉग आउट कर सकते हैं।", "VALIDATION_CODE_TITLE": "सत्यापन कोड शीर्षक", "VALIDATION_CODE_MESSAGE": "कृपया अपने {APP_NAME} खाते में साइन इन करने के लिए इस सत्यापन कोड का उपयोग करें:", "COPY_VALIDATION_CODE": "कोड कॉपी करें", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "खाता विवरण", "AI_QUOTA_USED": "एआई कोटा उपयोग किया गया", "LOGIN_REFRESH": "लॉगिन स्थिति जांचें", + "SIGN_IN_WAITING_TITLE": "साइन इन की प्रतीक्षा हो रही है", + "SIGN_IN_WAITING_MESSAGE": "कृपया नए टैब में साइन-इन पूरा करें, फिर यहां वापस आएं।", + "WAITING_FOR_LOGIN": "लॉगिन के लिए प्रतीक्षा हो रही है…", + "CHECK_NOW": "अभी जांचें", + "CHECKING": "जाँच हो रही है…", + "CHECKING_STATUS": "लॉगिन स्थिति की जाँच हो रही है…", + "NOT_SIGNED_IN_YET": "अभी तक साइन इन नहीं किया है। कृपया दूसरे टैब में साइन-इन पूरा करें।", + "POPUP_BLOCKED": "पॉप-अप ब्लॉक किया गया है। कृपया पॉप-अप की अनुमति दें और पुनः प्रयास करें, या मैन्युअल रूप से {0} पर नेविगेट करें", "COLLAPSE_ALL_FOLDERS": "सभी फ़ोल्डर संकुचित करें", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "कस्टम स्निपेट…", "CUSTOM_SNIPPETS_PANEL_TITLE": "कस्टम स्निपेट", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "टेम्पलेट टेक्स्ट", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "विवरण", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "फ़ाइल एक्सटेंशन", - "SIGNED_OUT_FAILED_MESSAGE": "लॉग आउट करते समय कुछ गड़बड़ हो गई। account.phcode.dev खोलने के लिए ठीक दबाएँ, जहाँ आप मैन्युअल रूप से लॉग आउट कर सकते हैं।", - "SIGN_IN_WAITING_TITLE": "साइन इन की प्रतीक्षा हो रही है", - "SIGN_IN_WAITING_MESSAGE": "कृपया नए टैब में साइन-इन पूरा करें, फिर यहां वापस आएं।", - "WAITING_FOR_LOGIN": "लॉगिन के लिए प्रतीक्षा हो रही है…", - "CHECK_NOW": "अभी जांचें", - "CHECKING": "जाँच हो रही है…", - "CHECKING_STATUS": "लॉगिन स्थिति की जाँच हो रही है…", - "NOT_SIGNED_IN_YET": "अभी तक साइन इन नहीं किया है। कृपया दूसरे टैब में साइन-इन पूरा करें।", - "WELCOME_BACK": "{0}, आपका स्वागत है!", - "POPUP_BLOCKED": "पॉप-अप ब्लॉक किया गया है। कृपया पॉप-अप की अनुमति दें और पुनः प्रयास करें, या मैन्युअल रूप से {0} पर नेविगेट करें" + "WELCOME_BACK": "वापस स्वागत है", + "WELCOME_BACK_USER": "{0}, वापस स्वागत है!" }); \ No newline at end of file diff --git a/src/nls/hr/lastTranslated.json b/src/nls/hr/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/hr/lastTranslated.json +++ b/src/nls/hr/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/hr/strings.js b/src/nls/hr/strings.js index 50a0cca583..9b4e4b05d4 100644 --- a/src/nls/hr/strings.js +++ b/src/nls/hr/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Prijava nije moguća", "SIGNED_IN_FAILED_MESSAGE": "Došlo je do pogreške prilikom prijave. Pokušajte ponovno.", "SIGNED_OUT_FAILED_TITLE": "Odjava nije uspjela", + "SIGNED_OUT_FAILED_MESSAGE": "Došlo je do pogreške prilikom odjave. Pritisnite U redu za otvaranje account.phcode.dev gdje se možete ručno odjaviti.", "VALIDATION_CODE_TITLE": "Verifikacijski kôd za prijavu", "VALIDATION_CODE_MESSAGE": "Molimo koristite ovaj verifikacijski kôd za prijavu na vaš {APP_NAME} račun:", "COPY_VALIDATION_CODE": "Kopiraj kôd", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Podaci o računu", "AI_QUOTA_USED": "Iskorištena AI kvota", "LOGIN_REFRESH": "Provjeri status prijave", + "SIGN_IN_WAITING_TITLE": "Prijava u tijeku", + "SIGN_IN_WAITING_MESSAGE": "Molimo dovršite prijavu u novoj kartici, a zatim se vratite ovdje.", + "WAITING_FOR_LOGIN": "Prijava u tijeku…", + "CHECK_NOW": "Provjeri sada", + "CHECKING": "Provjeravam…", + "CHECKING_STATUS": "Provjera statusa prijave…", + "NOT_SIGNED_IN_YET": "Još niste prijavljeni. Molimo dovršite prijavu u drugoj kartici.", + "POPUP_BLOCKED": "Skočni prozor blokiran. Molimo dopustite skočne prozore i pokušajte ponovno ili ručno idite na {0}", "COLLAPSE_ALL_FOLDERS": "Sažmi sve mape", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Prilagođeni isječci…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Prilagođeni isječci", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Tekst predloška", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Opis", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstenzija datoteke", - "SIGNED_OUT_FAILED_MESSAGE": "Došlo je do pogreške prilikom odjave. Pritisnite U redu za otvaranje account.phcode.dev gdje se možete ručno odjaviti.", - "SIGN_IN_WAITING_TITLE": "Prijava u tijeku", - "SIGN_IN_WAITING_MESSAGE": "Molimo dovršite prijavu u novoj kartici, a zatim se vratite ovdje.", - "WAITING_FOR_LOGIN": "Prijava u tijeku…", - "CHECK_NOW": "Provjeri sada", - "CHECKING": "Provjeravam…", - "CHECKING_STATUS": "Provjera statusa prijave…", - "NOT_SIGNED_IN_YET": "Još niste prijavljeni. Molimo dovršite prijavu u drugoj kartici.", - "WELCOME_BACK": "Dobrodošli natrag, {0}!", - "POPUP_BLOCKED": "Skočni prozor blokiran. Molimo dopustite skočne prozore i pokušajte ponovno ili ručno idite na {0}" + "WELCOME_BACK": "Dobrodošli natrag", + "WELCOME_BACK_USER": "Dobrodošli natrag, {0}!" }); \ No newline at end of file diff --git a/src/nls/hu/lastTranslated.json b/src/nls/hu/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/hu/lastTranslated.json +++ b/src/nls/hu/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/hu/strings.js b/src/nls/hu/strings.js index 7abd3f2825..0afb4e5588 100644 --- a/src/nls/hu/strings.js +++ b/src/nls/hu/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Nem lehet bejelentkezni", "SIGNED_IN_FAILED_MESSAGE": "Hiba történt a bejelentkezés során. Kérjük, próbáld újra.", "SIGNED_OUT_FAILED_TITLE": "Nem sikerült kijelentkezni", + "SIGNED_OUT_FAILED_MESSAGE": "Hiba történt a kijelentkezés során. Nyomd meg az OK gombot a(z) account.phcode.dev oldal megnyitásához, ahol manuálisan kijelentkezhetsz.", "VALIDATION_CODE_TITLE": "Bejelentkezési ellenőrző kód", "VALIDATION_CODE_MESSAGE": "Kérjük, használd ezt az ellenőrző kódot a(z) {APP_NAME} fiókodba való bejelentkezéshez:", "COPY_VALIDATION_CODE": "Kód másolása", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Fiókadatok", "AI_QUOTA_USED": "Felhasznált MI-kvóta", "LOGIN_REFRESH": "Bejelentkezés állapotának ellenőrzése", + "SIGN_IN_WAITING_TITLE": "Bejelentkezésre vár", + "SIGN_IN_WAITING_MESSAGE": "Kérjük, fejezd be a bejelentkezést az új lapon, majd térj vissza ide.", + "WAITING_FOR_LOGIN": "Bejelentkezésre vár…", + "CHECK_NOW": "Ellenőrzés most", + "CHECKING": "Ellenőrzés…", + "CHECKING_STATUS": "Bejelentkezési állapot ellenőrzése…", + "NOT_SIGNED_IN_YET": "Még nem jelentkeztél be. Kérjük, fejezd be a bejelentkezést a másik lapon.", + "POPUP_BLOCKED": "Felugró ablak blokkolva. Kérjük, engedélyezd a felugró ablakokat, és próbáld újra, vagy navigálj manuálisan ide: {0}", "COLLAPSE_ALL_FOLDERS": "Összes mappa összecsukása", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Egyéni kódrészletek…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Egyéni kódrészletek", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Sablonszöveg", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Leírás", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Fájlkiterjesztés", - "SIGNED_OUT_FAILED_MESSAGE": "Hiba történt a kijelentkezés során. Nyomd meg az OK gombot a(z) account.phcode.dev oldal megnyitásához, ahol manuálisan kijelentkezhetsz.", - "SIGN_IN_WAITING_TITLE": "Bejelentkezésre vár", - "SIGN_IN_WAITING_MESSAGE": "Kérjük, fejezd be a bejelentkezést az új lapon, majd térj vissza ide.", - "WAITING_FOR_LOGIN": "Bejelentkezésre vár…", - "CHECK_NOW": "Ellenőrzés most", - "CHECKING": "Ellenőrzés…", - "CHECKING_STATUS": "Bejelentkezési állapot ellenőrzése…", - "NOT_SIGNED_IN_YET": "Még nem jelentkeztél be. Kérjük, fejezd be a bejelentkezést a másik lapon.", - "WELCOME_BACK": "Üdvözlünk újra, {0}!", - "POPUP_BLOCKED": "Felugró ablak blokkolva. Kérjük, engedélyezd a felugró ablakokat, és próbáld újra, vagy navigálj manuálisan ide: {0}" + "WELCOME_BACK": "Üdvözlünk újra!", + "WELCOME_BACK_USER": "Üdvözlünk újra, {0}!" }); \ No newline at end of file diff --git a/src/nls/id/lastTranslated.json b/src/nls/id/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/id/lastTranslated.json +++ b/src/nls/id/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/id/strings.js b/src/nls/id/strings.js index de31511972..cc14fbef6f 100644 --- a/src/nls/id/strings.js +++ b/src/nls/id/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Tidak Dapat Masuk", "SIGNED_IN_FAILED_MESSAGE": "Terjadi kesalahan saat mencoba masuk. Silakan coba lagi.", "SIGNED_OUT_FAILED_TITLE": "Gagal Keluar", + "SIGNED_OUT_FAILED_MESSAGE": "Terjadi kesalahan saat keluar. Tekan OK untuk membuka account.phcode.dev tempat Anda dapat keluar secara manual.", "VALIDATION_CODE_TITLE": "Kode Verifikasi Masuk", "VALIDATION_CODE_MESSAGE": "Silakan gunakan kode Verifikasi ini untuk masuk ke akun {APP_NAME} Anda:", "COPY_VALIDATION_CODE": "Salin Kode", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detail Akun", "AI_QUOTA_USED": "Kuota AI terpakai", "LOGIN_REFRESH": "Periksa Status Login", + "SIGN_IN_WAITING_TITLE": "Menunggu Masuk", + "SIGN_IN_WAITING_MESSAGE": "Silakan selesaikan proses masuk di tab baru, lalu kembali ke sini.", + "WAITING_FOR_LOGIN": "Menunggu proses masuk…", + "CHECK_NOW": "Periksa Sekarang", + "CHECKING": "Memeriksa…", + "CHECKING_STATUS": "Memeriksa status masuk…", + "NOT_SIGNED_IN_YET": "Anda belum masuk. Silakan selesaikan proses masuk di tab lain.", + "POPUP_BLOCKED": "Pop-up diblokir. Harap izinkan pop-up dan coba lagi, atau buka {0} secara manual", "COLLAPSE_ALL_FOLDERS": "Ciutkan Semua Folder", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Cuplikan Kustom…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Cuplikan Kustom", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Teks Templat", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Deskripsi", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstensi Berkas", - "SIGNED_OUT_FAILED_MESSAGE": "Terjadi kesalahan saat keluar. Tekan OK untuk membuka account.phcode.dev tempat Anda dapat keluar secara manual.", - "SIGN_IN_WAITING_TITLE": "Menunggu Masuk", - "SIGN_IN_WAITING_MESSAGE": "Silakan selesaikan proses masuk di tab baru, lalu kembali ke sini.", - "WAITING_FOR_LOGIN": "Menunggu proses masuk…", - "CHECK_NOW": "Periksa Sekarang", - "CHECKING": "Memeriksa…", - "CHECKING_STATUS": "Memeriksa status masuk…", - "NOT_SIGNED_IN_YET": "Anda belum masuk. Silakan selesaikan proses masuk di tab lain.", - "WELCOME_BACK": "Selamat datang kembali, {0}!", - "POPUP_BLOCKED": "Pop-up diblokir. Harap izinkan pop-up dan coba lagi, atau buka {0} secara manual" + "WELCOME_BACK": "Selamat datang kembali", + "WELCOME_BACK_USER": "Selamat datang kembali, {0}!" }); \ No newline at end of file diff --git a/src/nls/it/lastTranslated.json b/src/nls/it/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/it/lastTranslated.json +++ b/src/nls/it/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index 7cfb53a18f..4d32cb93fa 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Impossibile accedere", "SIGNED_IN_FAILED_MESSAGE": "Si è verificato un errore durante l'accesso. Riprova.", "SIGNED_OUT_FAILED_TITLE": "Impossibile disconnettersi", + "SIGNED_OUT_FAILED_MESSAGE": "Si è verificato un errore durante la disconnessione. Premi OK per aprire account.phcode.dev dove puoi disconnetterti manualmente.", "VALIDATION_CODE_TITLE": "Codice di verifica per l'accesso", "VALIDATION_CODE_MESSAGE": "Utilizza questo codice di verifica per accedere al tuo account {APP_NAME}:", "COPY_VALIDATION_CODE": "Copia codice", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Dettagli account", "AI_QUOTA_USED": "Quota IA utilizzata", "LOGIN_REFRESH": "Verifica stato accesso", + "SIGN_IN_WAITING_TITLE": "Attendere l'accesso", + "SIGN_IN_WAITING_MESSAGE": "Completa l'accesso nella nuova scheda, quindi torna qui.", + "WAITING_FOR_LOGIN": "Accesso in corso…", + "CHECK_NOW": "Verifica ora", + "CHECKING": "Verifica in corso…", + "CHECKING_STATUS": "Verifica dello stato di accesso in corso…", + "NOT_SIGNED_IN_YET": "Accesso non ancora effettuato. Completa l'accesso nell'altra scheda.", + "POPUP_BLOCKED": "Popup bloccato. Autorizza i popup e riprova oppure vai manualmente a {0}", "COLLAPSE_ALL_FOLDERS": "Comprimi tutte le cartelle", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Frammenti personalizzati…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Frammenti personalizzati", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Testo del Modello", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrizione", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Estensione del File", - "SIGNED_OUT_FAILED_MESSAGE": "Si è verificato un errore durante la disconnessione. Premi OK per aprire account.phcode.dev dove puoi disconnetterti manualmente.", - "SIGN_IN_WAITING_TITLE": "Attendere l'accesso", - "SIGN_IN_WAITING_MESSAGE": "Completa l'accesso nella nuova scheda, quindi torna qui.", - "WAITING_FOR_LOGIN": "Accesso in corso…", - "CHECK_NOW": "Verifica ora", - "CHECKING": "Verifica in corso…", - "CHECKING_STATUS": "Verifica dello stato di accesso in corso…", - "NOT_SIGNED_IN_YET": "Accesso non ancora effettuato. Completa l'accesso nell'altra scheda.", - "WELCOME_BACK": "Bentornato, {0}!", - "POPUP_BLOCKED": "Popup bloccato. Autorizza i popup e riprova oppure vai manualmente a {0}" + "WELCOME_BACK": "Bentornato", + "WELCOME_BACK_USER": "Bentornato, {0}!" }); \ No newline at end of file diff --git a/src/nls/ja/lastTranslated.json b/src/nls/ja/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/ja/lastTranslated.json +++ b/src/nls/ja/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js index a1b607fb66..e6ac84e7ef 100644 --- a/src/nls/ja/strings.js +++ b/src/nls/ja/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "サインインできません", "SIGNED_IN_FAILED_MESSAGE": "サインイン中にエラーが発生しました。もう一度お試しください。", "SIGNED_OUT_FAILED_TITLE": "サインアウトに失敗しました", + "SIGNED_OUT_FAILED_MESSAGE": "ログアウト中にエラーが発生しました。「OK」を押してaccount.phcode.devを開き、手動でログアウトしてください。", "VALIDATION_CODE_TITLE": "ログイン認証コード", "VALIDATION_CODE_MESSAGE": "{APP_NAME}アカウントにログインするには、次の認証コードを使用してください。", "COPY_VALIDATION_CODE": "コードをコピー", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "アカウントの詳細", "AI_QUOTA_USED": "AI利用量", "LOGIN_REFRESH": "ログイン状態を確認", + "SIGN_IN_WAITING_TITLE": "サインインを待機中", + "SIGN_IN_WAITING_MESSAGE": "新しいタブでサインインを完了してから、ここに戻ってください。", + "WAITING_FOR_LOGIN": "ログイン中…", + "CHECK_NOW": "今すぐ確認", + "CHECKING": "確認中…", + "CHECKING_STATUS": "ログイン状態を確認中…", + "NOT_SIGNED_IN_YET": "まだサインインしていません。別のタブでサインインを完了してください。", + "POPUP_BLOCKED": "ポップアップがブロックされました。ポップアップを許可してもう一度お試しいただくか、{0} に手動でアクセスしてください。", "COLLAPSE_ALL_FOLDERS": "全てのフォルダを閉じる", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "カスタムスニペット…", "CUSTOM_SNIPPETS_PANEL_TITLE": "カスタムスニペット", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "テンプレートテキスト", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "説明", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ファイル拡張子", - "SIGNED_OUT_FAILED_MESSAGE": "ログアウト中にエラーが発生しました。「OK」を押してaccount.phcode.devを開き、手動でログアウトしてください。", - "SIGN_IN_WAITING_TITLE": "サインインを待機中", - "SIGN_IN_WAITING_MESSAGE": "新しいタブでサインインを完了してから、ここに戻ってください。", - "WAITING_FOR_LOGIN": "ログイン中…", - "CHECK_NOW": "今すぐ確認", - "CHECKING": "確認中…", - "CHECKING_STATUS": "ログイン状態を確認中…", - "NOT_SIGNED_IN_YET": "まだサインインしていません。別のタブでサインインを完了してください。", - "WELCOME_BACK": "{0} さん、おかえりなさい！", - "POPUP_BLOCKED": "ポップアップがブロックされました。ポップアップを許可してもう一度お試しいただくか、{0} に手動でアクセスしてください。" + "WELCOME_BACK": "おかえりなさい", + "WELCOME_BACK_USER": "{0}さん、おかえりなさい！" }); \ No newline at end of file diff --git a/src/nls/ko/lastTranslated.json b/src/nls/ko/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/ko/lastTranslated.json +++ b/src/nls/ko/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/ko/strings.js b/src/nls/ko/strings.js index 6586f2455b..100a775f21 100644 --- a/src/nls/ko/strings.js +++ b/src/nls/ko/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "로그인할 수 없음", "SIGNED_IN_FAILED_MESSAGE": "로그인하는 동안 오류가 발생했습니다. 다시 시도해 주세요.", "SIGNED_OUT_FAILED_TITLE": "로그아웃 실패", + "SIGNED_OUT_FAILED_MESSAGE": "로그아웃하는 동안 오류가 발생했습니다. 확인을 눌러 account.phcode.dev에서 직접 로그아웃하세요.", "VALIDATION_CODE_TITLE": "로그인 인증 코드", "VALIDATION_CODE_MESSAGE": "{APP_NAME} 계정에 로그인하려면 다음 인증 코드를 사용하세요:", "COPY_VALIDATION_CODE": "코드 복사", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "계정 세부정보", "AI_QUOTA_USED": "사용된 AI 할당량", "LOGIN_REFRESH": "로그인 상태 확인", + "SIGN_IN_WAITING_TITLE": "로그인 대기 중", + "SIGN_IN_WAITING_MESSAGE": "새 탭에서 로그인을 완료한 후 여기로 돌아오세요.", + "WAITING_FOR_LOGIN": "로그인 중…", + "CHECK_NOW": "지금 확인", + "CHECKING": "확인 중…", + "CHECKING_STATUS": "로그인 상태 확인 중…", + "NOT_SIGNED_IN_YET": "아직 로그인하지 않았습니다. 다른 탭에서 로그인을 완료하세요.", + "POPUP_BLOCKED": "팝업이 차단되었습니다. 팝업을 허용하고 다시 시도하거나, {0}으로 직접 이동하세요.", "COLLAPSE_ALL_FOLDERS": "모든 폴더 접기", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "사용자 정의 스니펫…", "CUSTOM_SNIPPETS_PANEL_TITLE": "사용자 정의 스니펫", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "템플릿 텍스트", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "설명", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "파일 확장자", - "SIGNED_OUT_FAILED_MESSAGE": "로그아웃하는 동안 오류가 발생했습니다. 확인을 눌러 account.phcode.dev에서 직접 로그아웃하세요.", - "SIGN_IN_WAITING_TITLE": "로그인 대기 중", - "SIGN_IN_WAITING_MESSAGE": "새 탭에서 로그인을 완료한 후 여기로 돌아오세요.", - "WAITING_FOR_LOGIN": "로그인 중…", - "CHECK_NOW": "지금 확인", - "CHECKING": "확인 중…", - "CHECKING_STATUS": "로그인 상태 확인 중…", - "NOT_SIGNED_IN_YET": "아직 로그인하지 않았습니다. 다른 탭에서 로그인을 완료하세요.", - "WELCOME_BACK": "{0}님, 다시 오신 것을 환영합니다!", - "POPUP_BLOCKED": "팝업이 차단되었습니다. 팝업을 허용하고 다시 시도하거나, {0}으로 직접 이동하세요." + "WELCOME_BACK": "다시 오신 것을 환영합니다", + "WELCOME_BACK_USER": "{0}님, 다시 오신 것을 환영합니다!" }); \ No newline at end of file diff --git a/src/nls/lv/lastTranslated.json b/src/nls/lv/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/lv/lastTranslated.json +++ b/src/nls/lv/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/lv/strings.js b/src/nls/lv/strings.js index 01743881fe..11e60ac981 100644 --- a/src/nls/lv/strings.js +++ b/src/nls/lv/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Nevar pieslēgties", "SIGNED_IN_FAILED_MESSAGE": "Radās kļūme, mēģinot pieslēgties. Lūdzu, mēģiniet vēlreiz.", "SIGNED_OUT_FAILED_TITLE": "Neizdevās izrakstīties", + "SIGNED_OUT_FAILED_MESSAGE": "Izrakstīšanās laikā radās kļūda. Nospiediet \"Labi\", lai atvērtu account.phcode.dev, kur varat izrakstīties manuāli.", "VALIDATION_CODE_TITLE": "Piekļuves kods", "VALIDATION_CODE_MESSAGE": "Lūdzu, izmantojiet šo piekļuves kodu, lai pieteiktos savā {APP_NAME} kontā:", "COPY_VALIDATION_CODE": "Kopēt kodu", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Konta informācija", "AI_QUOTA_USED": "Izmantotā AI kvota", "LOGIN_REFRESH": "Pārbaudīt pieteikšanās statusu", + "SIGN_IN_WAITING_TITLE": "Notiek pieteikšanās", + "SIGN_IN_WAITING_MESSAGE": "Lūdzu, pabeidziet pieteikšanos jaunajā cilnē un pēc tam atgriezieties šeit.", + "WAITING_FOR_LOGIN": "Notiek pieteikšanās…", + "CHECK_NOW": "Pārbaudīt tagad", + "CHECKING": "Pārbauda…", + "CHECKING_STATUS": "Pārbauda pieteikšanās statusu…", + "NOT_SIGNED_IN_YET": "Vēl neesat pieteicies. Lūdzu, pabeidziet pieteikšanos otrā cilnē.", + "POPUP_BLOCKED": "Uznirstošais logs ir bloķēts. Lūdzu, atļaujiet uznirstošos logus un mēģiniet vēlreiz vai arī manuāli dodieties uz {0}", "COLLAPSE_ALL_FOLDERS": "Sakļaut visas mapes", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Pielāgoti fragmenti…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Pielāgoti fragmenti", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Veidnes teksts", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Apraksts", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Faila paplašinājums", - "SIGNED_OUT_FAILED_MESSAGE": "Izrakstīšanās laikā radās kļūda. Nospiediet \"Labi\", lai atvērtu account.phcode.dev, kur varat izrakstīties manuāli.", - "SIGN_IN_WAITING_TITLE": "Notiek pieteikšanās", - "SIGN_IN_WAITING_MESSAGE": "Lūdzu, pabeidziet pieteikšanos jaunajā cilnē un pēc tam atgriezieties šeit.", - "WAITING_FOR_LOGIN": "Notiek pieteikšanās…", - "CHECK_NOW": "Pārbaudīt tagad", - "CHECKING": "Pārbauda…", - "CHECKING_STATUS": "Pārbauda pieteikšanās statusu…", - "NOT_SIGNED_IN_YET": "Vēl neesat pieteicies. Lūdzu, pabeidziet pieteikšanos otrā cilnē.", - "WELCOME_BACK": "Laipni lūdzam atpakaļ, {0}!", - "POPUP_BLOCKED": "Uznirstošais logs ir bloķēts. Lūdzu, atļaujiet uznirstošos logus un mēģiniet vēlreiz vai arī manuāli dodieties uz {0}" + "WELCOME_BACK": "Laipni lūdzam atpakaļ!", + "WELCOME_BACK_USER": "Laipni lūdzam atpakaļ, {0}!" }); \ No newline at end of file diff --git a/src/nls/ml/lastTranslated.json b/src/nls/ml/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/ml/lastTranslated.json +++ b/src/nls/ml/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/ml/strings.js b/src/nls/ml/strings.js index 36587428ea..eefd5e1534 100644 --- a/src/nls/ml/strings.js +++ b/src/nls/ml/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "സൈൻ ഇൻ ചെയ്യാൻ കഴിയില്ല", "SIGNED_IN_FAILED_MESSAGE": "സൈൻ ഇൻ ചെയ്യാൻ ശ്രമിക്കുമ്പോൾ എന്തോ പിഴച്ചു. വീണ്ടും ശ്രമിക്കുക.", "SIGNED_OUT_FAILED_TITLE": "സൈൻ ഔട്ട് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു", + "SIGNED_OUT_FAILED_MESSAGE": "ലോഗ്ഔട്ട് ചെയ്യുന്നതിൽ പിഴവ് സംഭവിച്ചു. ശരി ക്ലിക്ക് ചെയ്ത് account.phcode.dev തുറന്ന് ലോഗ്ഔട്ട് ചെയ്യുക.", "VALIDATION_CODE_TITLE": "സൈൻ ഇൻ വെരിഫിക്കേഷൻ കോഡ്", "VALIDATION_CODE_MESSAGE": "നിങ്ങളുടെ {APP_NAME} അക്കൗണ്ടിൽ സൈൻ ഇൻ ചെയ്യാൻ ഈ വെരിഫിക്കേഷൻ കോഡ് ഉപയോഗിക്കുക:", "COPY_VALIDATION_CODE": "കോഡ് പകർത്തുക", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "അക്കൗണ്ട് വിശദാംശങ്ങൾ", "AI_QUOTA_USED": "എഐ ക്വാട്ട ഉപയോഗിച്ചു", "LOGIN_REFRESH": "ലോഗിൻ സ്റ്റാറ്റസ് പരിശോധിക്കുക", + "SIGN_IN_WAITING_TITLE": "സൈൻ ഇൻ ചെയ്യുന്നതിനായി കാത്തിരിക്കുന്നു", + "SIGN_IN_WAITING_MESSAGE": "പുതിയ ടാബിൽ സൈൻ-ഇൻ പൂർത്തിയാക്കി ഇവിടേക്ക് തിരികെ വരിക.", + "WAITING_FOR_LOGIN": "ലോഗിൻ ചെയ്യുന്നതിനായി കാത്തിരിക്കുന്നു…", + "CHECK_NOW": "ഇപ്പോൾ പരിശോധിക്കുക", + "CHECKING": "പരിശോധിക്കുന്നു…", + "CHECKING_STATUS": "ലോഗിൻ സ്റ്റാറ്റസ് പരിശോധിക്കുന്നു…", + "NOT_SIGNED_IN_YET": "ഇതുവരെ സൈൻ ഇൻ ചെയ്തിട്ടില്ല. മറ്റൊരു ടാബിൽ സൈൻ-ഇൻ പൂർത്തിയാക്കുക.", + "POPUP_BLOCKED": "പോപ്പ്-അപ്പ് തടഞ്ഞിരിക്കുന്നു. പോപ്പ്-അപ്പുകൾ അനുവദിച്ചതിനുശേഷം വീണ്ടും ശ്രമിക്കുക, അല്ലെങ്കിൽ {0} ലേക്ക് നേരിട്ട് പോകുക.", "COLLAPSE_ALL_FOLDERS": "എല്ലാ ഫോൾഡറുകളും ചുരുക്കുക", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "കസ്റ്റം സ്നിപ്പെറ്റുകൾ…", "CUSTOM_SNIPPETS_PANEL_TITLE": "കസ്റ്റം സ്നിപ്പെറ്റുകൾ", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "ടെംപ്ലേറ്റ് ടെക്സ്റ്റ്", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "വിവരണം", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ഫയൽ എക്സ്റ്റൻഷൻ", - "SIGNED_OUT_FAILED_MESSAGE": "ലോഗ്ഔട്ട് ചെയ്യുന്നതിൽ പിഴവ് സംഭവിച്ചു. ശരി ക്ലിക്ക് ചെയ്ത് account.phcode.dev തുറന്ന് ലോഗ്ഔട്ട് ചെയ്യുക.", - "SIGN_IN_WAITING_TITLE": "സൈൻ ഇൻ ചെയ്യുന്നതിനായി കാത്തിരിക്കുന്നു", - "SIGN_IN_WAITING_MESSAGE": "പുതിയ ടാബിൽ സൈൻ-ഇൻ പൂർത്തിയാക്കി ഇവിടേക്ക് തിരികെ വരിക.", - "WAITING_FOR_LOGIN": "ലോഗിൻ ചെയ്യുന്നതിനായി കാത്തിരിക്കുന്നു…", - "CHECK_NOW": "ഇപ്പോൾ പരിശോധിക്കുക", - "CHECKING": "പരിശോധിക്കുന്നു…", - "CHECKING_STATUS": "ലോഗിൻ സ്റ്റാറ്റസ് പരിശോധിക്കുന്നു…", - "NOT_SIGNED_IN_YET": "ഇതുവരെ സൈൻ ഇൻ ചെയ്തിട്ടില്ല. മറ്റൊരു ടാബിൽ സൈൻ-ഇൻ പൂർത്തിയാക്കുക.", - "WELCOME_BACK": "{0}, വീണ്ടും സ്വാഗതം!", - "POPUP_BLOCKED": "പോപ്പ്-അപ്പ് തടഞ്ഞിരിക്കുന്നു. പോപ്പ്-അപ്പുകൾ അനുവദിച്ചതിനുശേഷം വീണ്ടും ശ്രമിക്കുക, അല്ലെങ്കിൽ {0} ലേക്ക് നേരിട്ട് പോകുക." + "WELCOME_BACK": "സ്വാഗതം", + "WELCOME_BACK_USER": "{0}, സ്വാഗതം!" }); \ No newline at end of file diff --git a/src/nls/nb/lastTranslated.json b/src/nls/nb/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/nb/lastTranslated.json +++ b/src/nls/nb/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/nb/strings.js b/src/nls/nb/strings.js index e49a44c85d..c79bb3a531 100644 --- a/src/nls/nb/strings.js +++ b/src/nls/nb/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Kan ikke logge inn", "SIGNED_IN_FAILED_MESSAGE": "Noe gikk galt under innlogging. Prøv igjen.", "SIGNED_OUT_FAILED_TITLE": "Kunne ikke logge ut", + "SIGNED_OUT_FAILED_MESSAGE": "Noe gikk galt under utlogging. Trykk OK for å åpne account.phcode.dev hvor du kan logge ut manuelt.", "VALIDATION_CODE_TITLE": "Verifikasjonskode for pålogging", "VALIDATION_CODE_MESSAGE": "Bruk denne verifikasjonskoden for å logge inn på {APP_NAME}-kontoen din:", "COPY_VALIDATION_CODE": "Kopier kode", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Kontodetaljer", "AI_QUOTA_USED": "AI-kvote brukt", "LOGIN_REFRESH": "Sjekk innloggingsstatus", + "SIGN_IN_WAITING_TITLE": "Venter på pålogging", + "SIGN_IN_WAITING_MESSAGE": "Fullfør påloggingen i den nye fanen, og returner deretter hit.", + "WAITING_FOR_LOGIN": "Venter på pålogging…", + "CHECK_NOW": "Sjekk nå", + "CHECKING": "Sjekker…", + "CHECKING_STATUS": "Sjekker påloggingsstatus…", + "NOT_SIGNED_IN_YET": "Ikke logget inn ennå. Vennligst fullfør påloggingen i den andre fanen.", + "POPUP_BLOCKED": "Popup blokkert. Tillat popup-vinduer og prøv igjen, eller gå manuelt til {0}", "COLLAPSE_ALL_FOLDERS": "Skjul alle mapper", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Egendefinerte kodesnutter…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Egendefinerte kodesnutter", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Maltekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivelse", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtype", - "SIGNED_OUT_FAILED_MESSAGE": "Noe gikk galt under utlogging. Trykk OK for å åpne account.phcode.dev hvor du kan logge ut manuelt.", - "SIGN_IN_WAITING_TITLE": "Venter på pålogging", - "SIGN_IN_WAITING_MESSAGE": "Fullfør påloggingen i den nye fanen, og returner deretter hit.", - "WAITING_FOR_LOGIN": "Venter på pålogging…", - "CHECK_NOW": "Sjekk nå", - "CHECKING": "Sjekker…", - "CHECKING_STATUS": "Sjekker påloggingsstatus…", - "NOT_SIGNED_IN_YET": "Ikke logget inn ennå. Vennligst fullfør påloggingen i den andre fanen.", - "WELCOME_BACK": "Velkommen tilbake, {0}!", - "POPUP_BLOCKED": "Popup blokkert. Tillat popup-vinduer og prøv igjen, eller gå manuelt til {0}" + "WELCOME_BACK": "Velkommen tilbake", + "WELCOME_BACK_USER": "Velkommen tilbake, {0}!" }); \ No newline at end of file diff --git a/src/nls/nl/lastTranslated.json b/src/nls/nl/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/nl/lastTranslated.json +++ b/src/nls/nl/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js index c695d2ede3..3b962e336b 100644 --- a/src/nls/nl/strings.js +++ b/src/nls/nl/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Aanmelden mislukt", "SIGNED_IN_FAILED_MESSAGE": "Er is iets misgegaan tijdens het aanmelden. Probeer het opnieuw.", "SIGNED_OUT_FAILED_TITLE": "Afmelden mislukt", + "SIGNED_OUT_FAILED_MESSAGE": "Er is iets misgegaan tijdens het uitloggen. Klik op OK om account.phcode.dev te openen, waar u handmatig kunt uitloggen.", "VALIDATION_CODE_TITLE": "Verificatiecode", "VALIDATION_CODE_MESSAGE": "Gebruik deze verificatiecode om in te loggen op uw {APP_NAME}-account:", "COPY_VALIDATION_CODE": "Code kopiëren", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Accountgegevens", "AI_QUOTA_USED": "Verbruikt AI-quotum", "LOGIN_REFRESH": "Aanmeldstatus controleren", + "SIGN_IN_WAITING_TITLE": "Aanmelden wordt verwerkt", + "SIGN_IN_WAITING_MESSAGE": "Voltooi de aanmelding in het nieuwe tabblad en keer hier terug.", + "WAITING_FOR_LOGIN": "Aanmelden...", + "CHECK_NOW": "Nu controleren", + "CHECKING": "Controleren...", + "CHECKING_STATUS": "Aanmeldstatus controleren...", + "NOT_SIGNED_IN_YET": "U bent nog niet aangemeld. Voltooi de aanmelding in het andere tabblad.", + "POPUP_BLOCKED": "Pop-up geblokkeerd. Sta pop-ups toe en probeer het opnieuw, of ga handmatig naar {0}", "COLLAPSE_ALL_FOLDERS": "Alle mappen samenvouwen", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Aangepaste fragmenten…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Aangepaste fragmenten", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Sjabloontekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beschrijving", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Bestandsextensie", - "SIGNED_OUT_FAILED_MESSAGE": "Er is iets misgegaan tijdens het uitloggen. Klik op OK om account.phcode.dev te openen, waar u handmatig kunt uitloggen.", - "SIGN_IN_WAITING_TITLE": "Aanmelden wordt verwerkt", - "SIGN_IN_WAITING_MESSAGE": "Voltooi de aanmelding in het nieuwe tabblad en keer hier terug.", - "WAITING_FOR_LOGIN": "Aanmelden...", - "CHECK_NOW": "Nu controleren", - "CHECKING": "Controleren...", - "CHECKING_STATUS": "Aanmeldstatus controleren...", - "NOT_SIGNED_IN_YET": "U bent nog niet aangemeld. Voltooi de aanmelding in het andere tabblad.", - "WELCOME_BACK": "Welkom terug, {0}!", - "POPUP_BLOCKED": "Pop-up geblokkeerd. Sta pop-ups toe en probeer het opnieuw, of ga handmatig naar {0}" + "WELCOME_BACK": "Welkom terug", + "WELCOME_BACK_USER": "Welkom terug, {0}!" }); \ No newline at end of file diff --git a/src/nls/pl/lastTranslated.json b/src/nls/pl/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/pl/lastTranslated.json +++ b/src/nls/pl/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/pl/strings.js b/src/nls/pl/strings.js index 6cc14ed654..8596989aea 100644 --- a/src/nls/pl/strings.js +++ b/src/nls/pl/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Nie można się zalogować", "SIGNED_IN_FAILED_MESSAGE": "Coś poszło nie tak podczas logowania. Spróbuj ponownie.", "SIGNED_OUT_FAILED_TITLE": "Nie udało się wylogować", + "SIGNED_OUT_FAILED_MESSAGE": "Wystąpił błąd podczas wylogowywania. Naciśnij OK, aby otworzyć account.phcode.dev, gdzie możesz wylogować się ręcznie.", "VALIDATION_CODE_TITLE": "Kod weryfikacyjny logowania", "VALIDATION_CODE_MESSAGE": "Użyj tego kodu weryfikacyjnego, aby zalogować się do swojego konta {APP_NAME}:", "COPY_VALIDATION_CODE": "Kopiuj kod", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Szczegóły konta", "AI_QUOTA_USED": "Wykorzystany limit AI", "LOGIN_REFRESH": "Sprawdź status logowania", + "SIGN_IN_WAITING_TITLE": "Oczekiwanie na logowanie", + "SIGN_IN_WAITING_MESSAGE": "Dokończ logowanie w nowej karcie, a następnie wróć tutaj.", + "WAITING_FOR_LOGIN": "Oczekiwanie na logowanie…", + "CHECK_NOW": "Sprawdź teraz", + "CHECKING": "Sprawdzanie…", + "CHECKING_STATUS": "Sprawdzanie statusu logowania…", + "NOT_SIGNED_IN_YET": "Nie zalogowano. Dokończ logowanie w drugiej karcie.", + "POPUP_BLOCKED": "Okno podręczne zablokowane. Zezwól na okna podręczne i spróbuj ponownie lub przejdź ręcznie do {0}", "COLLAPSE_ALL_FOLDERS": "Zwiń wszystkie foldery", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Własne fragmenty kodu…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Własne fragmenty kodu", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Treść szablonu", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Opis", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Rozszerzenie pliku", - "SIGNED_OUT_FAILED_MESSAGE": "Wystąpił błąd podczas wylogowywania. Naciśnij OK, aby otworzyć account.phcode.dev, gdzie możesz wylogować się ręcznie.", - "SIGN_IN_WAITING_TITLE": "Oczekiwanie na logowanie", - "SIGN_IN_WAITING_MESSAGE": "Dokończ logowanie w nowej karcie, a następnie wróć tutaj.", - "WAITING_FOR_LOGIN": "Oczekiwanie na logowanie…", - "CHECK_NOW": "Sprawdź teraz", - "CHECKING": "Sprawdzanie…", - "CHECKING_STATUS": "Sprawdzanie statusu logowania…", - "NOT_SIGNED_IN_YET": "Nie zalogowano. Dokończ logowanie w drugiej karcie.", - "WELCOME_BACK": "Witaj ponownie, {0}!", - "POPUP_BLOCKED": "Okno podręczne zablokowane. Zezwól na okna podręczne i spróbuj ponownie lub przejdź ręcznie do {0}" + "WELCOME_BACK": "Witaj ponownie", + "WELCOME_BACK_USER": "Witaj ponownie, {0}!" }); \ No newline at end of file diff --git a/src/nls/pt-br/lastTranslated.json b/src/nls/pt-br/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/pt-br/lastTranslated.json +++ b/src/nls/pt-br/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/pt-br/strings.js b/src/nls/pt-br/strings.js index facad97da0..d184bc00b9 100644 --- a/src/nls/pt-br/strings.js +++ b/src/nls/pt-br/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Não é possível fazer login", "SIGNED_IN_FAILED_MESSAGE": "Algo deu errado ao tentar fazer login. Tente novamente.", "SIGNED_OUT_FAILED_TITLE": "Falha ao desconectar", + "SIGNED_OUT_FAILED_MESSAGE": "Ocorreu um erro ao sair. Clique em OK para abrir account.phcode.dev onde você pode sair manualmente.", "VALIDATION_CODE_TITLE": "Código de Verificação para Login", "VALIDATION_CODE_MESSAGE": "Use este código de verificação para entrar na sua conta do {APP_NAME}:", "COPY_VALIDATION_CODE": "Copiar Código", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detalhes da Conta", "AI_QUOTA_USED": "Cota de IA usada", "LOGIN_REFRESH": "Verificar Status de Login", + "SIGN_IN_WAITING_TITLE": "Aguardando login", + "SIGN_IN_WAITING_MESSAGE": "Conclua o login na nova guia e retorne aqui.", + "WAITING_FOR_LOGIN": "Aguardando login…", + "CHECK_NOW": "Verificar agora", + "CHECKING": "Verificando…", + "CHECKING_STATUS": "Verificando status do login…", + "NOT_SIGNED_IN_YET": "Você ainda não está conectado. Conclua o login na outra guia.", + "POPUP_BLOCKED": "Pop-up bloqueado. Permita pop-ups e tente novamente ou navegue manualmente até {0}", "COLLAPSE_ALL_FOLDERS": "Recolher Todas as Pastas", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Trechos Personalizados…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Trechos Personalizados", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do Modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrição", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão do Arquivo", - "SIGNED_OUT_FAILED_MESSAGE": "Ocorreu um erro ao sair. Clique em OK para abrir account.phcode.dev onde você pode sair manualmente.", - "SIGN_IN_WAITING_TITLE": "Aguardando login", - "SIGN_IN_WAITING_MESSAGE": "Conclua o login na nova guia e retorne aqui.", - "WAITING_FOR_LOGIN": "Aguardando login…", - "CHECK_NOW": "Verificar agora", - "CHECKING": "Verificando…", - "CHECKING_STATUS": "Verificando status do login…", - "NOT_SIGNED_IN_YET": "Você ainda não está conectado. Conclua o login na outra guia.", - "WELCOME_BACK": "Bem-vindo de volta, {0}!", - "POPUP_BLOCKED": "Pop-up bloqueado. Permita pop-ups e tente novamente ou navegue manualmente até {0}" + "WELCOME_BACK": "Bem-vindo de volta", + "WELCOME_BACK_USER": "Bem-vindo de volta, {0}!" }); \ No newline at end of file diff --git a/src/nls/pt-pt/lastTranslated.json b/src/nls/pt-pt/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/pt-pt/lastTranslated.json +++ b/src/nls/pt-pt/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/pt-pt/strings.js b/src/nls/pt-pt/strings.js index 480e4884fa..dcfa892884 100644 --- a/src/nls/pt-pt/strings.js +++ b/src/nls/pt-pt/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Não é possível iniciar sessão", "SIGNED_IN_FAILED_MESSAGE": "Ocorreu um erro ao tentar iniciar sessão. Tente novamente.", "SIGNED_OUT_FAILED_TITLE": "Falha ao terminar sessão", + "SIGNED_OUT_FAILED_MESSAGE": "Ocorreu um erro ao terminar a sessão. Prima OK para abrir account.phcode.dev onde pode terminar a sessão manualmente.", "VALIDATION_CODE_TITLE": "Código de Verificação de Início de Sessão", "VALIDATION_CODE_MESSAGE": "Utilize este código de verificação para iniciar sessão na sua conta {APP_NAME}:", "COPY_VALIDATION_CODE": "Copiar Código", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detalhes da Conta", "AI_QUOTA_USED": "Quota de IA utilizada", "LOGIN_REFRESH": "Verificar estado de início de sessão", + "SIGN_IN_WAITING_TITLE": "A aguardar início de sessão", + "SIGN_IN_WAITING_MESSAGE": "Conclua o início de sessão no novo separador e volte para aqui.", + "WAITING_FOR_LOGIN": "A iniciar sessão…", + "CHECK_NOW": "Verificar agora", + "CHECKING": "A verificar…", + "CHECKING_STATUS": "A verificar o estado do início de sessão…", + "NOT_SIGNED_IN_YET": "Ainda não iniciou sessão. Conclua o início de sessão no outro separador.", + "POPUP_BLOCKED": "Janela pop-up bloqueada. Permita janelas pop-up e tente novamente ou navegue manualmente para {0}", "COLLAPSE_ALL_FOLDERS": "Recolher Todas as Pastas", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Fragmentos Personalizados…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Fragmentos Personalizados", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do Modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrição", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão de Ficheiro", - "SIGNED_OUT_FAILED_MESSAGE": "Ocorreu um erro ao terminar a sessão. Prima OK para abrir account.phcode.dev onde pode terminar a sessão manualmente.", - "SIGN_IN_WAITING_TITLE": "A aguardar início de sessão", - "SIGN_IN_WAITING_MESSAGE": "Conclua o início de sessão no novo separador e volte para aqui.", - "WAITING_FOR_LOGIN": "A iniciar sessão…", - "CHECK_NOW": "Verificar agora", - "CHECKING": "A verificar…", - "CHECKING_STATUS": "A verificar o estado do início de sessão…", - "NOT_SIGNED_IN_YET": "Ainda não iniciou sessão. Conclua o início de sessão no outro separador.", - "WELCOME_BACK": "Bem-vindo de volta, {0}!", - "POPUP_BLOCKED": "Janela pop-up bloqueada. Permita janelas pop-up e tente novamente ou navegue manualmente para {0}" + "WELCOME_BACK": "Bem-vindo de volta", + "WELCOME_BACK_USER": "Bem-vindo de volta, {0}!" }); \ No newline at end of file diff --git a/src/nls/ro/lastTranslated.json b/src/nls/ro/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/ro/lastTranslated.json +++ b/src/nls/ro/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/ro/strings.js b/src/nls/ro/strings.js index eabb2f5efd..c76ee12ed2 100644 --- a/src/nls/ro/strings.js +++ b/src/nls/ro/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Autentificarea nu este posibilă", "SIGNED_IN_FAILED_MESSAGE": "Ceva nu a mers bine în timpul autentificării. Te rugăm să încerci din nou.", "SIGNED_OUT_FAILED_TITLE": "Deconectare eșuată", + "SIGNED_OUT_FAILED_MESSAGE": "A apărut o eroare la deconectare. Apăsați OK pentru a deschide account.phcode.dev unde vă puteți deconecta manual.", "VALIDATION_CODE_TITLE": "Cod de verificare pentru conectare", "VALIDATION_CODE_MESSAGE": "Te rugăm să folosești acest cod de verificare pentru a te conecta la contul tău {APP_NAME}:", "COPY_VALIDATION_CODE": "Copiază codul", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detalii cont", "AI_QUOTA_USED": "Cotă AI utilizată", "LOGIN_REFRESH": "Verificare stare autentificare", + "SIGN_IN_WAITING_TITLE": "Se așteaptă autentificarea", + "SIGN_IN_WAITING_MESSAGE": "Finalizați autentificarea în noua filă, apoi reveniți aici.", + "WAITING_FOR_LOGIN": "Se așteaptă autentificarea…", + "CHECK_NOW": "Verifică acum", + "CHECKING": "Se verifică…", + "CHECKING_STATUS": "Se verifică starea de autentificare…", + "NOT_SIGNED_IN_YET": "Nu sunteți încă autentificat. Vă rugăm finalizați autentificarea în cealaltă filă.", + "POPUP_BLOCKED": "Fereastră pop-up blocată. Vă rugăm permiteți ferestrele pop-up și încercați din nou sau navigați manual la {0}", "COLLAPSE_ALL_FOLDERS": "Restrânge Toate Folderele", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Fragmente de cod personalizate…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Fragmente de cod personalizate", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text șablon", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descriere", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensie fișier", - "SIGNED_OUT_FAILED_MESSAGE": "A apărut o eroare la deconectare. Apăsați OK pentru a deschide account.phcode.dev unde vă puteți deconecta manual.", - "SIGN_IN_WAITING_TITLE": "Se așteaptă autentificarea", - "SIGN_IN_WAITING_MESSAGE": "Finalizați autentificarea în noua filă, apoi reveniți aici.", - "WAITING_FOR_LOGIN": "Se așteaptă autentificarea…", - "CHECK_NOW": "Verifică acum", - "CHECKING": "Se verifică…", - "CHECKING_STATUS": "Se verifică starea de autentificare…", - "NOT_SIGNED_IN_YET": "Nu sunteți încă autentificat. Vă rugăm finalizați autentificarea în cealaltă filă.", - "WELCOME_BACK": "Bine ai revenit, {0}!", - "POPUP_BLOCKED": "Fereastră pop-up blocată. Vă rugăm permiteți ferestrele pop-up și încercați din nou sau navigați manual la {0}" + "WELCOME_BACK": "Bine ai revenit", + "WELCOME_BACK_USER": "Bine ai revenit, {0}!" }); \ No newline at end of file diff --git a/src/nls/ru/lastTranslated.json b/src/nls/ru/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/ru/lastTranslated.json +++ b/src/nls/ru/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/ru/strings.js b/src/nls/ru/strings.js index 2f156c2932..f391407bed 100644 --- a/src/nls/ru/strings.js +++ b/src/nls/ru/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Не удаётся войти", "SIGNED_IN_FAILED_MESSAGE": "Что-то пошло не так при попытке входа. Пожалуйста, попробуйте ещё раз.", "SIGNED_OUT_FAILED_TITLE": "Не удалось выйти из системы", + "SIGNED_OUT_FAILED_MESSAGE": "При выходе из системы произошла ошибка. Нажмите «ОК», чтобы открыть account.phcode.dev, где вы можете выйти вручную.", "VALIDATION_CODE_TITLE": "Код подтверждения входа", "VALIDATION_CODE_MESSAGE": "Пожалуйста, используйте этот код подтверждения для входа в вашу учетную запись {APP_NAME}:", "COPY_VALIDATION_CODE": "Скопировать код", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Сведения об учетной записи", "AI_QUOTA_USED": "Использована квота ИИ", "LOGIN_REFRESH": "Проверить статус входа", + "SIGN_IN_WAITING_TITLE": "Ожидание входа", + "SIGN_IN_WAITING_MESSAGE": "Пожалуйста, завершите вход в новой вкладке, затем вернитесь сюда.", + "WAITING_FOR_LOGIN": "Ожидание входа…", + "CHECK_NOW": "Проверить сейчас", + "CHECKING": "Проверка…", + "CHECKING_STATUS": "Проверка статуса входа…", + "NOT_SIGNED_IN_YET": "Вы ещё не вошли в систему. Пожалуйста, завершите вход в другой вкладке.", + "POPUP_BLOCKED": "Всплывающее окно заблокировано. Разрешите всплывающие окна и попробуйте снова или перейдите вручную по адресу {0}", "COLLAPSE_ALL_FOLDERS": "Свернуть все папки", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Пользовательские сниппеты…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Пользовательские сниппеты", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблона", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Описание", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Расширение файла", - "SIGNED_OUT_FAILED_MESSAGE": "При выходе из системы произошла ошибка. Нажмите «ОК», чтобы открыть account.phcode.dev, где вы можете выйти вручную.", - "SIGN_IN_WAITING_TITLE": "Ожидание входа", - "SIGN_IN_WAITING_MESSAGE": "Пожалуйста, завершите вход в новой вкладке, затем вернитесь сюда.", - "WAITING_FOR_LOGIN": "Ожидание входа…", - "CHECK_NOW": "Проверить сейчас", - "CHECKING": "Проверка…", - "CHECKING_STATUS": "Проверка статуса входа…", - "NOT_SIGNED_IN_YET": "Вы ещё не вошли в систему. Пожалуйста, завершите вход в другой вкладке.", - "WELCOME_BACK": "С возвращением, {0}!", - "POPUP_BLOCKED": "Всплывающее окно заблокировано. Разрешите всплывающие окна и попробуйте снова или перейдите вручную по адресу {0}" + "WELCOME_BACK": "С возвращением", + "WELCOME_BACK_USER": "С возвращением, {0}!" }); \ No newline at end of file diff --git a/src/nls/sk/lastTranslated.json b/src/nls/sk/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/sk/lastTranslated.json +++ b/src/nls/sk/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/sk/strings.js b/src/nls/sk/strings.js index 5764a38456..30e643010c 100644 --- a/src/nls/sk/strings.js +++ b/src/nls/sk/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Nie je možné sa prihlásiť", "SIGNED_IN_FAILED_MESSAGE": "Pri pokuse o prihlásenie sa vyskytla chyba. Skúste to znova.", "SIGNED_OUT_FAILED_TITLE": "Odhlásenie zlyhalo", + "SIGNED_OUT_FAILED_MESSAGE": "Pri odhlásení sa vyskytla chyba. Stlačte OK pre otvorenie account.phcode.dev, kde sa môžete odhlásiť manuálne.", "VALIDATION_CODE_TITLE": "Overovací kód pre prihlásenie", "VALIDATION_CODE_MESSAGE": "Prosím, použite tento overovací kód na prihlásenie do vášho {APP_NAME} účtu:", "COPY_VALIDATION_CODE": "Kopírovať kód", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Detaily účtu", "AI_QUOTA_USED": "Využité AI kvóty", "LOGIN_REFRESH": "Skontrolovať stav prihlásenia", + "SIGN_IN_WAITING_TITLE": "Čaká sa na prihlásenie", + "SIGN_IN_WAITING_MESSAGE": "Dokončite prihlásenie v novom okne a potom sa sem vráťte.", + "WAITING_FOR_LOGIN": "Prihlasovanie…", + "CHECK_NOW": "Skontrolovať teraz", + "CHECKING": "Kontroluje sa…", + "CHECKING_STATUS": "Kontroluje sa stav prihlásenia…", + "NOT_SIGNED_IN_YET": "Zatiaľ nie ste prihlásený. Dokončite prihlásenie v druhom okne.", + "POPUP_BLOCKED": "Vyskakovacie okno bolo zablokované. Povoľte vyskakovacie okná a skúste to znova alebo prejdite manuálne na {0}", "COLLAPSE_ALL_FOLDERS": "Zbaliť všetky priečinky", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Vlastné úryvky…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Vlastné úryvky", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text šablóny", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Popis", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Prípona súboru", - "SIGNED_OUT_FAILED_MESSAGE": "Pri odhlásení sa vyskytla chyba. Stlačte OK pre otvorenie account.phcode.dev, kde sa môžete odhlásiť manuálne.", - "SIGN_IN_WAITING_TITLE": "Čaká sa na prihlásenie", - "SIGN_IN_WAITING_MESSAGE": "Dokončite prihlásenie v novom okne a potom sa sem vráťte.", - "WAITING_FOR_LOGIN": "Prihlasovanie…", - "CHECK_NOW": "Skontrolovať teraz", - "CHECKING": "Kontroluje sa…", - "CHECKING_STATUS": "Kontroluje sa stav prihlásenia…", - "NOT_SIGNED_IN_YET": "Zatiaľ nie ste prihlásený. Dokončite prihlásenie v druhom okne.", - "WELCOME_BACK": "Vitajte späť, {0}!", - "POPUP_BLOCKED": "Vyskakovacie okno bolo zablokované. Povoľte vyskakovacie okná a skúste to znova alebo prejdite manuálne na {0}" + "WELCOME_BACK": "Vitajte späť", + "WELCOME_BACK_USER": "Vitajte späť, {0}!" }); \ No newline at end of file diff --git a/src/nls/sr/lastTranslated.json b/src/nls/sr/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/sr/lastTranslated.json +++ b/src/nls/sr/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/sr/strings.js b/src/nls/sr/strings.js index cb7b25132a..f5445ad049 100644 --- a/src/nls/sr/strings.js +++ b/src/nls/sr/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Није могуће пријавити се", "SIGNED_IN_FAILED_MESSAGE": "Дошло је до грешке приликом пријављивања. Молимо вас покушајте поново.", "SIGNED_OUT_FAILED_TITLE": "Одјављивање није успело", + "SIGNED_OUT_FAILED_MESSAGE": "Дошло је до грешке приликом одјављивања. Притисните OK да бисте отворили account.phcode.dev где можете ручно да се одјавите.", "VALIDATION_CODE_TITLE": "Код за потврду пријаве", "VALIDATION_CODE_MESSAGE": "Молимо Вас да користите овај код за потврду како бисте се пријавили на ваш {APP_NAME} налог:", "COPY_VALIDATION_CODE": "Копирај код", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Подаци о налогу", "AI_QUOTA_USED": "Искоришћена AI квота", "LOGIN_REFRESH": "Провери статус пријаве", + "SIGN_IN_WAITING_TITLE": "Чека се пријављивање", + "SIGN_IN_WAITING_MESSAGE": "Молимо Вас да завршите пријављивање у новом табу, а затим се вратите овде.", + "WAITING_FOR_LOGIN": "Пријављивање у току…", + "CHECK_NOW": "Провери сада", + "CHECKING": "Проверава се…", + "CHECKING_STATUS": "Проверава се статус пријаве…", + "NOT_SIGNED_IN_YET": "Још увек нисте пријављени. Молимо Вас да завршите пријављивање у другом табу.", + "POPUP_BLOCKED": "Искачући прозор је блокиран. Молимо Вас да дозволите искачуће прозоре и покушате поново или ручно пређите на {0}", "COLLAPSE_ALL_FOLDERS": "Скупи све фасцикле", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Кориснички исечци…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Кориснички исечци", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблона", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Опис", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Екстензија датотеке", - "SIGNED_OUT_FAILED_MESSAGE": "Дошло је до грешке приликом одјављивања. Притисните OK да бисте отворили account.phcode.dev где можете ручно да се одјавите.", - "SIGN_IN_WAITING_TITLE": "Чека се пријављивање", - "SIGN_IN_WAITING_MESSAGE": "Молимо Вас да завршите пријављивање у новом табу, а затим се вратите овде.", - "WAITING_FOR_LOGIN": "Пријављивање у току…", - "CHECK_NOW": "Провери сада", - "CHECKING": "Проверава се…", - "CHECKING_STATUS": "Проверава се статус пријаве…", - "NOT_SIGNED_IN_YET": "Још увек нисте пријављени. Молимо Вас да завршите пријављивање у другом табу.", - "WELCOME_BACK": "Добродошли назад, {0}!", - "POPUP_BLOCKED": "Искачући прозор је блокиран. Молимо Вас да дозволите искачуће прозоре и покушате поново или ручно пређите на {0}" + "WELCOME_BACK": "Добродошли назад", + "WELCOME_BACK_USER": "Добродошли назад, {0}!" }); \ No newline at end of file diff --git a/src/nls/sv/lastTranslated.json b/src/nls/sv/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/sv/lastTranslated.json +++ b/src/nls/sv/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/sv/strings.js b/src/nls/sv/strings.js index 25111aeeb4..fb13e70ea5 100644 --- a/src/nls/sv/strings.js +++ b/src/nls/sv/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Kan inte logga in", "SIGNED_IN_FAILED_MESSAGE": "Något gick fel när du försökte logga in. Försök igen.", "SIGNED_OUT_FAILED_TITLE": "Kunde inte logga ut", + "SIGNED_OUT_FAILED_MESSAGE": "Något gick fel vid utloggningen. Tryck på OK för att öppna account.phcode.dev där du kan logga ut manuellt.", "VALIDATION_CODE_TITLE": "Verifieringskod för inloggning", "VALIDATION_CODE_MESSAGE": "Använd denna verifieringskod för att logga in på ditt {APP_NAME}-konto:", "COPY_VALIDATION_CODE": "Kopiera kod", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Kontodetaljer", "AI_QUOTA_USED": "Använd AI-kvot", "LOGIN_REFRESH": "Kontrollera inloggningsstatus", + "SIGN_IN_WAITING_TITLE": "Väntar på inloggning", + "SIGN_IN_WAITING_MESSAGE": "Slutför inloggningen i den nya fliken och återvänd sedan hit.", + "WAITING_FOR_LOGIN": "Väntar på inloggning…", + "CHECK_NOW": "Kontrollera nu", + "CHECKING": "Kontrollerar…", + "CHECKING_STATUS": "Kontrollerar inloggningsstatus…", + "NOT_SIGNED_IN_YET": "Inte inloggad än. Slutför inloggningen i den andra fliken.", + "POPUP_BLOCKED": "Popup-fönster blockerades. Tillåt popup-fönster och försök igen, eller gå manuellt till {0}", "COLLAPSE_ALL_FOLDERS": "Komprimera alla mappar", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Anpassade kodsnuttar…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Anpassade kodsnuttar", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Malltext", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivning", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filändelse", - "SIGNED_OUT_FAILED_MESSAGE": "Något gick fel vid utloggningen. Tryck på OK för att öppna account.phcode.dev där du kan logga ut manuellt.", - "SIGN_IN_WAITING_TITLE": "Väntar på inloggning", - "SIGN_IN_WAITING_MESSAGE": "Slutför inloggningen i den nya fliken och återvänd sedan hit.", - "WAITING_FOR_LOGIN": "Väntar på inloggning…", - "CHECK_NOW": "Kontrollera nu", - "CHECKING": "Kontrollerar…", - "CHECKING_STATUS": "Kontrollerar inloggningsstatus…", - "NOT_SIGNED_IN_YET": "Inte inloggad än. Slutför inloggningen i den andra fliken.", - "WELCOME_BACK": "Välkommen tillbaka, {0}!", - "POPUP_BLOCKED": "Popup-fönster blockerades. Tillåt popup-fönster och försök igen, eller gå manuellt till {0}" + "WELCOME_BACK": "Välkommen tillbaka", + "WELCOME_BACK_USER": "Välkommen tillbaka, {0}!" }); \ No newline at end of file diff --git a/src/nls/tr/lastTranslated.json b/src/nls/tr/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/tr/lastTranslated.json +++ b/src/nls/tr/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/tr/strings.js b/src/nls/tr/strings.js index 810e7c16f3..82da31a901 100644 --- a/src/nls/tr/strings.js +++ b/src/nls/tr/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Oturum Açılamıyor", "SIGNED_IN_FAILED_MESSAGE": "Oturum açmaya çalışırken bir hata oluştu. Lütfen tekrar deneyin.", "SIGNED_OUT_FAILED_TITLE": "Oturum Kapatılamadı", + "SIGNED_OUT_FAILED_MESSAGE": "Oturum kapatılırken bir hata oluştu. account.phcode.dev adresini açmak ve oturumu manuel olarak kapatmak için Tamam'a basın.", "VALIDATION_CODE_TITLE": "Doğrulama Kodu", "VALIDATION_CODE_MESSAGE": "Lütfen {APP_NAME} hesabınıza giriş yapmak için bu Doğrulama kodunu kullanın:", "COPY_VALIDATION_CODE": "Kodu Kopyala", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Hesap Ayrıntıları", "AI_QUOTA_USED": "Yapay Zeka kotası kullanıldı", "LOGIN_REFRESH": "Oturum Durumunu Kontrol Et", + "SIGN_IN_WAITING_TITLE": "Oturum Açma Bekleniyor", + "SIGN_IN_WAITING_MESSAGE": "Lütfen yeni sekmede oturum açmayı tamamlayın ve buraya geri dönün.", + "WAITING_FOR_LOGIN": "Oturum açılıyor…", + "CHECK_NOW": "Şimdi Kontrol Et", + "CHECKING": "Kontrol ediliyor…", + "CHECKING_STATUS": "Oturum açma durumu kontrol ediliyor…", + "NOT_SIGNED_IN_YET": "Henüz oturum açılmadı. Lütfen diğer sekmede oturum açmayı tamamlayın.", + "POPUP_BLOCKED": "Açılır pencere engellendi. Lütfen açılır pencerelere izin verin ve tekrar deneyin veya {0} adresine manuel olarak gidin.", "COLLAPSE_ALL_FOLDERS": "Tüm Klasörleri Daralt", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Özel Parçacıklar…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Özel Parçacıklar", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Şablon Metni", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Açıklama", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dosya Uzantısı", - "SIGNED_OUT_FAILED_MESSAGE": "Oturum kapatılırken bir hata oluştu. account.phcode.dev adresini açmak ve oturumu manuel olarak kapatmak için Tamam'a basın.", - "SIGN_IN_WAITING_TITLE": "Oturum Açma Bekleniyor", - "SIGN_IN_WAITING_MESSAGE": "Lütfen yeni sekmede oturum açmayı tamamlayın ve buraya geri dönün.", - "WAITING_FOR_LOGIN": "Oturum açılıyor…", - "CHECK_NOW": "Şimdi Kontrol Et", - "CHECKING": "Kontrol ediliyor…", - "CHECKING_STATUS": "Oturum açma durumu kontrol ediliyor…", - "NOT_SIGNED_IN_YET": "Henüz oturum açılmadı. Lütfen diğer sekmede oturum açmayı tamamlayın.", - "WELCOME_BACK": "Tekrar hoş geldiniz, {0}!", - "POPUP_BLOCKED": "Açılır pencere engellendi. Lütfen açılır pencerelere izin verin ve tekrar deneyin veya {0} adresine manuel olarak gidin." + "WELCOME_BACK": "Tekrar hoş geldiniz", + "WELCOME_BACK_USER": "Hoş geldiniz, {0}!" }); \ No newline at end of file diff --git a/src/nls/uk/lastTranslated.json b/src/nls/uk/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/uk/lastTranslated.json +++ b/src/nls/uk/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/uk/strings.js b/src/nls/uk/strings.js index 69c16d1014..780ca3b31a 100644 --- a/src/nls/uk/strings.js +++ b/src/nls/uk/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "Не вдається увійти", "SIGNED_IN_FAILED_MESSAGE": "Щось пішло не так під час спроби входу. Будь ласка, спробуйте ще раз.", "SIGNED_OUT_FAILED_TITLE": "Не вдалося вийти з системи", + "SIGNED_OUT_FAILED_MESSAGE": "Сталася помилка під час виходу з облікового запису. Натисніть OK, щоб відкрити account.phcode.dev, де ви можете вийти вручну.", "VALIDATION_CODE_TITLE": "Код підтвердження входу", "VALIDATION_CODE_MESSAGE": "Будь ласка, скористайтеся цим кодом підтвердження, щоб увійти до свого облікового запису {APP_NAME}:", "COPY_VALIDATION_CODE": "Копіювати код", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "Дані облікового запису", "AI_QUOTA_USED": "Використано квоту ШІ", "LOGIN_REFRESH": "Перевірити статус входу", + "SIGN_IN_WAITING_TITLE": "Очікування на вхід", + "SIGN_IN_WAITING_MESSAGE": "Будь ласка, завершіть вхід у новій вкладці, а потім поверніться сюди.", + "WAITING_FOR_LOGIN": "Очікування на вхід…", + "CHECK_NOW": "Перевірити зараз", + "CHECKING": "Перевірка…", + "CHECKING_STATUS": "Перевірка статусу входу…", + "NOT_SIGNED_IN_YET": "Ви ще не ввійшли. Будь ласка, завершіть вхід в іншій вкладці.", + "POPUP_BLOCKED": "Спливаюче вікно заблоковано. Будь ласка, дозвольте спливаючі вікна та спробуйте ще раз або перейдіть вручну до {0}", "COLLAPSE_ALL_FOLDERS": "Згорнути всі папки", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Власні сніпети…", "CUSTOM_SNIPPETS_PANEL_TITLE": "Власні сніпети", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблону", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Опис", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Розширення файлу", - "SIGNED_OUT_FAILED_MESSAGE": "Сталася помилка під час виходу з облікового запису. Натисніть OK, щоб відкрити account.phcode.dev, де ви можете вийти вручну.", - "SIGN_IN_WAITING_TITLE": "Очікування на вхід", - "SIGN_IN_WAITING_MESSAGE": "Будь ласка, завершіть вхід у новій вкладці, а потім поверніться сюди.", - "WAITING_FOR_LOGIN": "Очікування на вхід…", - "CHECK_NOW": "Перевірити зараз", - "CHECKING": "Перевірка…", - "CHECKING_STATUS": "Перевірка статусу входу…", - "NOT_SIGNED_IN_YET": "Ви ще не ввійшли. Будь ласка, завершіть вхід в іншій вкладці.", - "WELCOME_BACK": "Ласкаво просимо назад, {0}!", - "POPUP_BLOCKED": "Спливаюче вікно заблоковано. Будь ласка, дозвольте спливаючі вікна та спробуйте ще раз або перейдіть вручну до {0}" + "WELCOME_BACK": "Ласкаво просимо назад", + "WELCOME_BACK_USER": "Ласкаво просимо назад, {0}!" }); \ No newline at end of file diff --git a/src/nls/ur/lastTranslated.json b/src/nls/ur/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/ur/lastTranslated.json +++ b/src/nls/ur/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/ur/strings.js b/src/nls/ur/strings.js index 85d4d78aa1..6c14cd074c 100644 --- a/src/nls/ur/strings.js +++ b/src/nls/ur/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "سائن ان نہیں ہو سکتا", "SIGNED_IN_FAILED_MESSAGE": "سائن ان کرنے کی کوشش میں کچھ غلط ہو گیا۔ براہ کرم دوبارہ کوشش کریں۔", "SIGNED_OUT_FAILED_TITLE": "سائن آؤٹ ناکام", + "SIGNED_OUT_FAILED_MESSAGE": "لاگ آؤٹ ہوتے وقت کچھ غلط ہو گیا۔ براہ کرم account.phcode.dev کھولنے کے لیے ٹھیک ہے دبائیں جہاں آپ دستی طور پر لاگ آؤٹ کر سکتے ہیں۔", "VALIDATION_CODE_TITLE": "تصدیقی کوڈ", "VALIDATION_CODE_MESSAGE": "برائے مہربانی اپنے {APP_NAME} اکاؤنٹ میں سائن ان کرنے کیلئے اس تصدیقی کوڈ کا استعمال کریں:", "COPY_VALIDATION_CODE": "کوڈ نقل کریں", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "اکاؤنٹ کی تفصیلات", "AI_QUOTA_USED": "استعمال شدہ اے آئی کوٹہ", "LOGIN_REFRESH": "لاگ ان کی حیثیت چیک کریں", + "SIGN_IN_WAITING_TITLE": "سائن ان کا انتظار ہے", + "SIGN_IN_WAITING_MESSAGE": "براہ کرم نئے ٹیب میں سائن ان مکمل کریں، پھر یہاں واپس آئیں۔", + "WAITING_FOR_LOGIN": "لاگ ان کا انتظار ہے…", + "CHECK_NOW": "ابھی چیک کریں", + "CHECKING": "جانچ پڑتال ہو رہی ہے…", + "CHECKING_STATUS": "لاگ ان کی حیثیت چیک کر رہے ہیں…", + "NOT_SIGNED_IN_YET": "ابھی تک سائن ان نہیں ہوا ہے۔ براہ کرم دوسرے ٹیب میں سائن ان مکمل کریں۔", + "POPUP_BLOCKED": "پاپ اپ بلاک کر دیا گیا۔ براہ کرم پاپ اپ کی اجازت دیں اور دوبارہ کوشش کریں، یا دستی طور پر {0} پر جائیں۔", "COLLAPSE_ALL_FOLDERS": "تمام فولڈرز بند کریں", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "حسب ضرورت سنیپٹس…", "CUSTOM_SNIPPETS_PANEL_TITLE": "حسب ضرورت سنیپٹس", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "ٹیمپلیٹ متن", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "وضاحت", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "فائل ایکسٹینشن", - "SIGNED_OUT_FAILED_MESSAGE": "لاگ آؤٹ ہوتے وقت کچھ غلط ہو گیا۔ براہ کرم account.phcode.dev کھولنے کے لیے ٹھیک ہے دبائیں جہاں آپ دستی طور پر لاگ آؤٹ کر سکتے ہیں۔", - "SIGN_IN_WAITING_TITLE": "سائن ان کا انتظار ہے", - "SIGN_IN_WAITING_MESSAGE": "براہ کرم نئے ٹیب میں سائن ان مکمل کریں، پھر یہاں واپس آئیں۔", - "WAITING_FOR_LOGIN": "لاگ ان کا انتظار ہے…", - "CHECK_NOW": "ابھی چیک کریں", - "CHECKING": "جانچ پڑتال ہو رہی ہے…", - "CHECKING_STATUS": "لاگ ان کی حیثیت چیک کر رہے ہیں…", - "NOT_SIGNED_IN_YET": "ابھی تک سائن ان نہیں ہوا ہے۔ براہ کرم دوسرے ٹیب میں سائن ان مکمل کریں۔", - "WELCOME_BACK": "خوش آمدید {0}!", - "POPUP_BLOCKED": "پاپ اپ بلاک کر دیا گیا۔ براہ کرم پاپ اپ کی اجازت دیں اور دوبارہ کوشش کریں، یا دستی طور پر {0} پر جائیں۔" + "WELCOME_BACK": "خوش آمدید واپس", + "WELCOME_BACK_USER": "{0}، خوش آمدید واپس!" }); \ No newline at end of file diff --git a/src/nls/zh-cn/lastTranslated.json b/src/nls/zh-cn/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/zh-cn/lastTranslated.json +++ b/src/nls/zh-cn/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 6f49cca12b..efd8eeb590 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "无法登录", "SIGNED_IN_FAILED_MESSAGE": "登录时出现问题。请重试。", "SIGNED_OUT_FAILED_TITLE": "退出登录失败", + "SIGNED_OUT_FAILED_MESSAGE": "登出时出错。请按“确定”打开account.phcode.dev手动登出。", "VALIDATION_CODE_TITLE": "登录验证码", "VALIDATION_CODE_MESSAGE": "请使用此验证码登录您的{APP_NAME}帐户：", "COPY_VALIDATION_CODE": "复制验证码", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "帐户详情", "AI_QUOTA_USED": "AI 配额已用", "LOGIN_REFRESH": "检查登录状态", + "SIGN_IN_WAITING_TITLE": "等待登录", + "SIGN_IN_WAITING_MESSAGE": "请在新标签页中完成登录，然后返回此处。", + "WAITING_FOR_LOGIN": "正在登录…", + "CHECK_NOW": "立即检查", + "CHECKING": "正在检查…", + "CHECKING_STATUS": "正在检查登录状态…", + "NOT_SIGNED_IN_YET": "尚未登录。请在另一个标签页中完成登录。", + "POPUP_BLOCKED": "弹窗被阻止。请允许弹窗并重试，或手动导航至 {0}", "COLLAPSE_ALL_FOLDERS": "折叠所有文件夹", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "自定义代码片段…", "CUSTOM_SNIPPETS_PANEL_TITLE": "自定义代码片段", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "模板文本", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "描述", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "文件扩展名", - "SIGNED_OUT_FAILED_MESSAGE": "登出时出错。请按“确定”打开account.phcode.dev手动登出。", - "SIGN_IN_WAITING_TITLE": "等待登录", - "SIGN_IN_WAITING_MESSAGE": "请在新标签页中完成登录，然后返回此处。", - "WAITING_FOR_LOGIN": "正在登录…", - "CHECK_NOW": "立即检查", - "CHECKING": "正在检查…", - "CHECKING_STATUS": "正在检查登录状态…", - "NOT_SIGNED_IN_YET": "尚未登录。请在另一个标签页中完成登录。", - "WELCOME_BACK": "欢迎回来，{0}！", - "POPUP_BLOCKED": "弹窗被阻止。请允许弹窗并重试，或手动导航至 {0}" + "WELCOME_BACK": "欢迎回来", + "WELCOME_BACK_USER": "欢迎回来，{0}！" }); \ No newline at end of file diff --git a/src/nls/zh-tw/lastTranslated.json b/src/nls/zh-tw/lastTranslated.json index ad34aa9761..9f862ba277 100644 --- a/src/nls/zh-tw/lastTranslated.json +++ b/src/nls/zh-tw/lastTranslated.json @@ -1428,7 +1428,8 @@ "WEBPAGE_BOOTSTRAP_EXAMPLES": "Bootstrap Examples", "WEBPAGE_DASHBOARD": "HTML Dashboard", "WEBPAGE_HOME_PAGE": "Home Page", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", + "WELCOME_BACK_USER": "Welcome back, {0}!", "WINDOW_UNLOAD_WARNING": "Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WINDOW_UNLOAD_WARNING_WITH_UNSAVED_CHANGES": "You have unsaved changes! Are you sure you want to navigate to a different URL and leave {APP_NAME}?", "WORKING_FILES": "Working Files", diff --git a/src/nls/zh-tw/strings.js b/src/nls/zh-tw/strings.js index 982399dfd2..d16d222309 100644 --- a/src/nls/zh-tw/strings.js +++ b/src/nls/zh-tw/strings.js @@ -1394,6 +1394,7 @@ define({ "SIGNED_IN_FAILED_TITLE": "無法登入", "SIGNED_IN_FAILED_MESSAGE": "登入時發生錯誤。請再試一次。", "SIGNED_OUT_FAILED_TITLE": "登出失敗", + "SIGNED_OUT_FAILED_MESSAGE": "登出時發生錯誤。請按一下「確定」開啟 account.phcode.dev 以手動登出。", "VALIDATION_CODE_TITLE": "登入驗證碼", "VALIDATION_CODE_MESSAGE": "請使用此驗證碼登入您的 {APP_NAME} 帳號：", "COPY_VALIDATION_CODE": "複製驗證碼", @@ -1406,6 +1407,14 @@ define({ "ACCOUNT_DETAILS": "帳號詳細資訊", "AI_QUOTA_USED": "AI 配額已使用", "LOGIN_REFRESH": "檢查登入狀態", + "SIGN_IN_WAITING_TITLE": "等待登入中", + "SIGN_IN_WAITING_MESSAGE": "請在新分頁中完成登入，然後返回此處。", + "WAITING_FOR_LOGIN": "正在登入中…", + "CHECK_NOW": "立即檢查", + "CHECKING": "檢查中…", + "CHECKING_STATUS": "正在檢查登入狀態…", + "NOT_SIGNED_IN_YET": "您尚未登入。請在另一個分頁中完成登入。", + "POPUP_BLOCKED": "彈出視窗遭到封鎖。請允許彈出視窗並重試，或手動前往 {0}", "COLLAPSE_ALL_FOLDERS": "收合所有資料夾", "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "自訂程式碼片段…", "CUSTOM_SNIPPETS_PANEL_TITLE": "自訂程式碼片段", @@ -1447,14 +1456,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "範本文字", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "描述", "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "檔案副檔名", - "SIGNED_OUT_FAILED_MESSAGE": "登出時發生錯誤。請按一下「確定」開啟 account.phcode.dev 以手動登出。", - "SIGN_IN_WAITING_TITLE": "等待登入中", - "SIGN_IN_WAITING_MESSAGE": "請在新分頁中完成登入，然後返回此處。", - "WAITING_FOR_LOGIN": "正在登入中…", - "CHECK_NOW": "立即檢查", - "CHECKING": "檢查中…", - "CHECKING_STATUS": "正在檢查登入狀態…", - "NOT_SIGNED_IN_YET": "您尚未登入。請在另一個分頁中完成登入。", - "WELCOME_BACK": "歡迎回來，{0}！", - "POPUP_BLOCKED": "彈出視窗遭到封鎖。請允許彈出視窗並重試，或手動前往 {0}" + "WELCOME_BACK": "歡迎回來", + "WELCOME_BACK_USER": "歡迎回來，{0}！" }); \ No newline at end of file From aa4102ef21066c3ec5f1e26b7f653ecc57c13514 Mon Sep 17 00:00:00 2001 From: Pluto Date: Sat, 23 Aug 2025 23:19:50 +0530 Subject: [PATCH 167/849] fix: background color gets removed from elements when its set inline --- .../BrowserScripts/RemoteFunctions.js | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index e83ee6e6b9..8d32b228ca 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -2205,10 +2205,26 @@ function RemoteFunctions(config = {}) { // helper function to clear element background highlighting function clearElementBackground(element) { + // make sure that the feature is enabled and also the element has the attribute 'data-brackets-id' + if ( + !config.isLPEditFeaturesActive || + !element.hasAttribute("data-brackets-id") || + element.tagName === "BODY" || + element.tagName === "HTML" || + _isInsideHeadTag(element) + ) { + return; + } + if (element._originalBackgroundColor !== undefined) { element.style.backgroundColor = element._originalBackgroundColor; } else { - element.style.backgroundColor = ""; + // only clear background if it's currently a highlight color, not if it's an original user style + const currentBg = element.style.backgroundColor; + if (currentBg === "rgba(0, 162, 255, 0.2)" || currentBg.includes("rgba(0, 162, 255")) { + element.style.backgroundColor = ""; + } + // if it's some other color, we just leave it as is - it's likely a user-defined style } delete element._originalBackgroundColor; } @@ -2308,15 +2324,14 @@ function RemoteFunctions(config = {}) { element._originalOutline = element.style.outline; element.style.outline = "1px solid #4285F4"; - // Add highlight for click mode - if (getHighlightMode() === "click") { + if (element._originalBackgroundColor === undefined) { element._originalBackgroundColor = element.style.backgroundColor; - element.style.backgroundColor = "rgba(0, 162, 255, 0.2)"; + } + element.style.backgroundColor = "rgba(0, 162, 255, 0.2)"; - if (_hoverHighlight) { - _hoverHighlight.clear(); - _hoverHighlight.add(element, true, false); // false means no auto-scroll - } + if (_hoverHighlight) { + _hoverHighlight.clear(); + _hoverHighlight.add(element, true, false); // false means no auto-scroll } previouslyClickedElement = element; From 73beac93c3a472bb5b55ef24a114776ffa9cc85f Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 24 Aug 2025 13:22:38 +0530 Subject: [PATCH 168/849] refactor: improved code readability --- .../BrowserScripts/RemoteFunctions.js | 227 +++++++----------- 1 file changed, 86 insertions(+), 141 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 8d32b228ca..8ac0809110 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -113,6 +113,29 @@ function RemoteFunctions(config = {}) { return event.ctrlKey; } + /** + * This is a checker function for editable elements, it makes sure that the element satisfies all the required checks + * - When onlyHighlight is false → config.isLPEditFeaturesActive must be true + * - When onlyHighlight is true → config.isLPEditFeaturesActive can be true or false (doesn't matter) + * @param {DOMElement} element + * @param {boolean} [onlyHighlight=false] - If true, bypasses the isLPEditFeaturesActive check + * @returns {boolean} - True if the element is editable else false + */ + function isElementEditable(element, onlyHighlight = false) { + if(!config.isLPEditFeaturesActive && !onlyHighlight) { + return false; + } + + if(element && // element should exist + element.hasAttribute("data-brackets-id") && // should have the data-brackets-id attribute + element.tagName !== "BODY" && // shouldn't be the body tag + element.tagName !== "HTML" && // shouldn't be the HTML tag + !_isInsideHeadTag(element)) { // shouldn't be inside the head tag like meta tags and all + return true; + } + return false; + } + // helper function to check if an element is inside the HEAD tag // we need this because we don't wanna trigger the element highlights on head tag and its children function _isInsideHeadTag(element) { @@ -224,9 +247,9 @@ function RemoteFunctions(config = {}) { * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute */ function _handleDeleteOptionClick(event, element) { - const tagId = element.getAttribute("data-brackets-id"); + if (isElementEditable(element)) { + const tagId = element.getAttribute("data-brackets-id"); - if (tagId && element.tagName !== "BODY" && element.tagName !== "HTML" && !_isInsideHeadTag(element)) { window._Brackets_MessageBroker.send({ livePreviewEditEnabled: true, element: element, @@ -245,9 +268,9 @@ function RemoteFunctions(config = {}) { * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute */ function _handleDuplicateOptionClick(event, element) { - const tagId = element.getAttribute("data-brackets-id"); + if (isElementEditable(element)) { + const tagId = element.getAttribute("data-brackets-id"); - if (tagId && element.tagName !== "BODY" && element.tagName !== "HTML" && !_isInsideHeadTag(element)) { window._Brackets_MessageBroker.send({ livePreviewEditEnabled: true, element: element, @@ -267,23 +290,12 @@ function RemoteFunctions(config = {}) { * @param {DOMElement} element - the HTML DOM element that was clicked. it is to get the data-brackets-id attribute */ function _handleSelectParentOptionClick(event, element) { - if (!element) { + if (!isElementEditable(element)) { return; } const parentElement = element.parentElement; - if (!parentElement) { - return; - } - - // we need to make sure that the parent element is not the body tag or the html. - // also we expect it to have the 'data-brackets-id' - if ( - parentElement.tagName !== "BODY" && - parentElement.tagName !== "HTML" && - !_isInsideHeadTag(parentElement) && - parentElement.hasAttribute("data-brackets-id") - ) { + if (isElementEditable(parentElement)) { parentElement.click(); } else { console.error("The TagID might be unavailable or the parent element tag is directly body or html"); @@ -1072,19 +1084,14 @@ function RemoteFunctions(config = {}) { * @returns {boolean} - true if we should show the select parent option otherwise false */ function _shouldShowSelectParentOption(element) { - if (!element || !element.parentElement) { + if(!isElementEditable(element)) { return false; } const parentElement = element.parentElement; - - if (parentElement.tagName === "HTML" || parentElement.tagName === "BODY" || _isInsideHeadTag(parentElement)) { - return false; - } - if (!parentElement.hasAttribute("data-brackets-id")) { + if(!isElementEditable(parentElement)) { return false; } - return true; } @@ -1825,7 +1832,7 @@ function RemoteFunctions(config = {}) { _handleSend: function(event, prompt) { const element = this.element; - if(!element) { + if(!isElementEditable(element)) { return; } const tagId = element.getAttribute("data-brackets-id"); @@ -2173,10 +2180,9 @@ function RemoteFunctions(config = {}) { function onMouseOver(event) { if (_validEvent(event)) { - // Skip highlighting for HTML, BODY tags and elements inside HEAD - if (event.target && event.target.nodeType === Node.ELEMENT_NODE && - event.target.tagName !== "HTML" && event.target.tagName !== "BODY" && !_isInsideHeadTag(event.target)) { - _localHighlight.add(event.target, true, false); // false means no-auto scroll + const element = event.target; + if(isElementEditable(element) && element.nodeType === Node.ELEMENT_NODE ) { + _localHighlight.add(element, true, false); // false means no-auto scroll } } } @@ -2205,17 +2211,6 @@ function RemoteFunctions(config = {}) { // helper function to clear element background highlighting function clearElementBackground(element) { - // make sure that the feature is enabled and also the element has the attribute 'data-brackets-id' - if ( - !config.isLPEditFeaturesActive || - !element.hasAttribute("data-brackets-id") || - element.tagName === "BODY" || - element.tagName === "HTML" || - _isInsideHeadTag(element) - ) { - return; - } - if (element._originalBackgroundColor !== undefined) { element.style.backgroundColor = element._originalBackgroundColor; } else { @@ -2235,36 +2230,29 @@ function RemoteFunctions(config = {}) { return; } + const element = event.target; + if(!isElementEditable(element) || element.nodeType !== Node.ELEMENT_NODE) { + return false; + } + // if _hoverHighlight is uninitialized, initialize it - if (!_hoverHighlight && config.isLPEditFeaturesActive && shouldShowHighlightOnHover()) { + if (!_hoverHighlight && shouldShowHighlightOnHover()) { _hoverHighlight = new Highlight("#c8f9c5", true); } // this is to check the user's settings, if they want to show the elements highlights on hover or click - if (_hoverHighlight && config.isLPEditFeaturesActive && shouldShowHighlightOnHover()) { + if (_hoverHighlight && shouldShowHighlightOnHover()) { _hoverHighlight.clear(); - // Skip highlighting for HTML, BODY tags and elements inside HEAD - // and for DOM elements which doesn't have 'data-brackets-id' - // NOTE: Don't remove 'data-brackets-id' check else hover will also target internal live preview elements - if ( - event.target && - event.target.nodeType === Node.ELEMENT_NODE && - event.target.tagName !== "HTML" && - event.target.tagName !== "BODY" && - !_isInsideHeadTag(event.target) && - event.target.hasAttribute("data-brackets-id") - ) { - // Store original background color to restore on hover out - event.target._originalBackgroundColor = event.target.style.backgroundColor; - event.target.style.backgroundColor = "rgba(0, 162, 255, 0.2)"; - - _hoverHighlight.add(event.target, false, false); // false means no auto-scroll - - // Create info box for the hovered element - dismissNodeInfoBox(); - _nodeInfoBox = new NodeInfoBox(event.target); - } + // Store original background color to restore on hover out + element._originalBackgroundColor = element.style.backgroundColor; + element.style.backgroundColor = "rgba(0, 162, 255, 0.2)"; + + _hoverHighlight.add(element, false, false); // false means no auto-scroll + + // Create info box for the hovered element + dismissNodeInfoBox(); + _nodeInfoBox = new NodeInfoBox(element); } } @@ -2274,23 +2262,15 @@ function RemoteFunctions(config = {}) { return; } - // this is to check the user's settings, if they want to show the elements highlights on hover or click - if (_hoverHighlight && config.isLPEditFeaturesActive && shouldShowHighlightOnHover()) { - _hoverHighlight.clear(); - - // Restore original background color - if ( - event && - event.target && - event.target.nodeType === Node.ELEMENT_NODE && - event.target.hasAttribute("data-brackets-id") - ) { - clearElementBackground(event.target); + const element = event.target; + if(isElementEditable(element) && element.nodeType === Node.ELEMENT_NODE) { + // this is to check the user's settings, if they want to show the elements highlights on hover or click + if (_hoverHighlight && shouldShowHighlightOnHover()) { + _hoverHighlight.clear(); + clearElementBackground(element); } - - // Remove info box when mouse leaves the element - dismissNodeInfoBox(); } + dismissNodeInfoBox(); } /** @@ -2300,16 +2280,8 @@ function RemoteFunctions(config = {}) { function _selectElement(element) { // dismiss all UI boxes and cleanup previous element state when selecting a different element dismissUIAndCleanupState(); - - // make sure that the feature is enabled and also the element has the attribute 'data-brackets-id' - if ( - !config.isLPEditFeaturesActive || - !element.hasAttribute("data-brackets-id") || - element.tagName === "BODY" || - element.tagName === "HTML" || - _isInsideHeadTag(element) - ) { - return; + if(!isElementEditable(element)) { + return false; } // make sure that the element is actually visible to the user @@ -2344,25 +2316,17 @@ function RemoteFunctions(config = {}) { */ function onClick(event) { dismissAIPromptBox(); + const element = event.target; - // make sure that the feature is enabled and also the clicked element has the attribute 'data-brackets-id' - if ( - config.isLPEditFeaturesActive && - event.target.hasAttribute("data-brackets-id") && - event.target.tagName !== "BODY" && - event.target.tagName !== "HTML" && - !_isInsideHeadTag(event.target) - ) { + // when user clicks on the HTML, BODY tags or elements inside HEAD, we want to remove the boxes + if(_nodeMoreOptionsBox && !isElementEditable(element)) { + dismissUIAndCleanupState(); + } else if(isElementEditable(element)) { event.preventDefault(); event.stopPropagation(); event.stopImmediatePropagation(); - _selectElement(event.target); - } else if ( // when user clicks on the HTML, BODY tags or elements inside HEAD, we want to remove the boxes - _nodeMoreOptionsBox && - (event.target.tagName === "HTML" || event.target.tagName === "BODY" || _isInsideHeadTag(event.target)) - ) { - dismissUIAndCleanupState(); + _selectElement(element); } } @@ -2371,18 +2335,13 @@ function RemoteFunctions(config = {}) { * @param {Event} event */ function onDoubleClick(event) { - if ( - config.isLPEditFeaturesActive && - event.target.hasAttribute("data-brackets-id") && - event.target.tagName !== "BODY" && - event.target.tagName !== "HTML" && - !_isInsideHeadTag(event.target) - ) { + const element = event.target; + if (isElementEditable(element)) { // because we only want to allow double click text editing where we show the edit option - if (_shouldShowEditTextOption(event.target)) { + if (_shouldShowEditTextOption(element)) { event.preventDefault(); event.stopPropagation(); - startEditing(event.target); + startEditing(element); } } } @@ -2425,18 +2384,16 @@ function RemoteFunctions(config = {}) { } } - // highlight a node - function highlight(node, clear) { + // highlight an element + function highlight(element, clear) { if (!_clickHighlight) { _clickHighlight = new Highlight("#cfc"); } if (clear) { _clickHighlight.clear(); } - // Skip highlighting for HTML, BODY tags and elements inside HEAD - if (node && node.nodeType === Node.ELEMENT_NODE && - node.tagName !== "HTML" && node.tagName !== "BODY" && !_isInsideHeadTag(node)) { - _clickHighlight.add(node, true, true); // 3rd arg is for auto-scroll + if (isElementEditable(element, true) && element.nodeType === Node.ELEMENT_NODE) { + _clickHighlight.add(element, true, true); // 3rd arg is for auto-scroll } } @@ -2455,12 +2412,7 @@ function RemoteFunctions(config = {}) { // select the first valid highlighted element var foundValidElement = false; for (i = 0; i < nodes.length; i++) { - if (nodes[i].hasAttribute("data-brackets-id") && - nodes[i].tagName !== "HTML" && - nodes[i].tagName !== "BODY" && - !_isInsideHeadTag(nodes[i]) && - nodes[i].tagName !== "BR" - ) { + if(isElementEditable(nodes[i], true) && nodes[i].tagName !== "BR") { _selectElement(nodes[i]); foundValidElement = true; break; @@ -3015,12 +2967,7 @@ function RemoteFunctions(config = {}) { // Function to handle direct editing of elements in the live preview function startEditing(element) { - if (!config.isLPEditFeaturesActive - || !element - || element.tagName === "BODY" - || element.tagName === "HTML" - || _isInsideHeadTag(element) - || !element.hasAttribute("data-brackets-id")) { + if (!isElementEditable(element)) { return; } @@ -3065,7 +3012,7 @@ function RemoteFunctions(config = {}) { // Function to finish editing and apply changes // isEditSuccessful: this is a boolean value, defaults to true. false only when the edit operation is cancelled function finishEditing(element, isEditSuccessful = true) { - if (!config.isLPEditFeaturesActive || !element || !element.hasAttribute("contenteditable")) { + if (!isElementEditable(element) || !element.hasAttribute("contenteditable")) { return; } @@ -3080,17 +3027,15 @@ function RemoteFunctions(config = {}) { delete element._editListeners; } - if (element.hasAttribute("data-brackets-id")) { - const tagId = element.getAttribute("data-brackets-id"); - window._Brackets_MessageBroker.send({ - livePreviewEditEnabled: true, - livePreviewTextEdit: true, - element: element, - newContent: element.outerHTML, - tagId: Number(tagId), - isEditSuccessful: isEditSuccessful - }); - } + const tagId = element.getAttribute("data-brackets-id"); + window._Brackets_MessageBroker.send({ + livePreviewEditEnabled: true, + livePreviewTextEdit: true, + element: element, + newContent: element.outerHTML, + tagId: Number(tagId), + isEditSuccessful: isEditSuccessful + }); } // init From 89c23de74fc92a8442f9073e2ba061b8623faa4d Mon Sep 17 00:00:00 2001 From: Pluto Date: Sun, 24 Aug 2025 15:13:50 +0530 Subject: [PATCH 169/849] fix: dirty marker appears after undo operation --- src/LiveDevelopment/BrowserScripts/RemoteFunctions.js | 7 ++++--- src/LiveDevelopment/LivePreviewEdit.js | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js index 8ac0809110..72291b69a3 100644 --- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js +++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js @@ -137,19 +137,20 @@ function RemoteFunctions(config = {}) { } // helper function to check if an element is inside the HEAD tag - // we need this because we don't wanna trigger the element highlights on head tag and its children + // we need this because we don't wanna trigger the element highlights on head tag and its children, + // except for
@@ -24,7 +40,8 @@ image
-

{{APP_TITLE}}

+

{{APP_TITLE}}

+

Phoenix Pro

{{BUILD_THE_WEB}} diff --git a/src/index.html b/src/index.html index 3bfd308b3f..9e287c2feb 100644 --- a/src/index.html +++ b/src/index.html @@ -350,6 +350,7 @@ baseURL: _getBaseURL(), isTestWindow: _isTestWindow(), firstBoot: false, // will be set below + pro: {}, startTime: Date.now(), TRUSTED_ORIGINS: { // if modifying this list, make sure to update in https://github.com/phcode-dev/phcode.live/blob/main/docs/trustedOrigins.js diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index ea1006fb4b..7390539a11 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -184,6 +184,43 @@ define(function (require, exports, module) { _setupDocumentClickHandler(); } + /** + * Update main navigation branding based on entitlements + */ + function _updateBranding(entitlements) { + const $brandingLink = $("#phcode-io-main-nav"); + if (!entitlements) { + Phoenix.pro.plan = { + paidSubscriber: false, + name: "Community Edition", + isInTrial: false + }; + return; + } + + if (entitlements && entitlements.plan){ + Phoenix.pro.plan = { + paidSubscriber: entitlements.plan.paidSubscriber, + name: entitlements.plan.name, + isInTrial: entitlements.plan.isInTrial, + validTill: entitlements.plan.validTill + }; + } + if (entitlements && entitlements.plan && entitlements.plan.paidSubscriber) { + // Paid subscriber: show plan name with feather icon + const planName = entitlements.plan.name || "Phoenix Pro"; + $brandingLink + .attr("href", "https://account.phcode.dev") + .addClass("phoenix-pro") + .html(`${planName}`); + } else { + // Free user: show phcode.io branding + $brandingLink + .attr("href", "https://phcode.io") + .removeClass("phoenix-pro") + .text("phcode.io"); + } + } let userEmail=""; class SecureEmail extends HTMLElement { @@ -366,7 +403,7 @@ define(function (require, exports, module) { isPopupVisible = true; positionPopup(); - + // Apply cached entitlements immediately if available (including quota/messages) KernalModeTrust.loginService.getEntitlements(false).then(cachedEntitlements => { if (cachedEntitlements && isPopupVisible) { @@ -504,6 +541,9 @@ define(function (require, exports, module) { // Clear cached entitlements when user logs out LoginService.clearEntitlements(); + + // Reset branding to free mode + _updateBranding(null); } function setLoggedIn(initial, color) { @@ -514,9 +554,11 @@ define(function (require, exports, module) { _updateProfileIcon(initial, color); // Preload entitlements when user logs in - KernalModeTrust.loginService.getEntitlements().catch(error => { - console.error('Failed to preload entitlements on login:', error); - }); + KernalModeTrust.loginService.getEntitlements() + .then(_updateBranding) + .catch(error => { + console.error('Failed to preload entitlements on login:', error); + }); } exports.init = init; diff --git a/src/styles/brackets.less b/src/styles/brackets.less index f7100dee51..933ae3a304 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -82,6 +82,15 @@ html, body { color: @dark-bc-text-link; } +#phcode-io-main-nav.phoenix-pro{ + background: @phoenix-pro-gradient; + background-clip: text; + -webkit-background-clip: text; /* Chrome, Safari */ + color: transparent; /* works in Firefox */ + -webkit-text-fill-color: transparent; /* Chrome, Safari */ + display: inline-block; +} + #ctrl-nav-overlay { position: absolute; display: flex; /* Enable flexbox */ diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index 71fc73aa40..8221598fbd 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -279,3 +279,12 @@ // CSS Codehint icon @css-codehint-icon: #2ea56c; @dark-css-codehint-icon: #146a41; + +// phoenix pro +@phoenix-pro-gradient: linear-gradient( + 45deg, + #ff8c42, /* deep orange */ + #ffa500, /* bright orange */ + #ffcc70, /* golden yellow */ + #ffd700 /* rich gold */ +); diff --git a/test/SpecRunner.html b/test/SpecRunner.html index 21fc3bb5e8..feaaf3ecd2 100644 --- a/test/SpecRunner.html +++ b/test/SpecRunner.html @@ -270,6 +270,7 @@ isSpecRunnerWindow: window.location.pathname.endsWith("/SpecRunner.html"), firstBoot: false, // will be set below startTime: Date.now(), + pro: {}, TRUSTED_ORIGINS: { // if modifying this list, make sure to update in https://github.com/phcode-dev/phcode.live/blob/main/docs/trustedOrigins.js // extensions may add their trusted origin to this list at any time. From 39a8573da06f2e376f25fc41f3c305d6525293dc Mon Sep 17 00:00:00 2001 From: abose Date: Mon, 1 Sep 2025 10:56:35 +0530 Subject: [PATCH 192/849] chore: move back to account server instead of dev server accidentally checked in --- serve-proxy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serve-proxy.js b/serve-proxy.js index 4773be090f..01a870bc02 100644 --- a/serve-proxy.js +++ b/serve-proxy.js @@ -8,8 +8,8 @@ const fs = require('fs'); const httpProxy = require('http-proxy'); // Account server configuration - switch between local and production -//const ACCOUNT_SERVER = 'https://account.phcode.dev'; // Production -const ACCOUNT_SERVER = 'http://localhost:5000'; // Local development +const ACCOUNT_SERVER = 'https://account.phcode.dev'; // Production +// const ACCOUNT_SERVER = 'http://localhost:5000'; // Local development // Default configuration let config = { From 96ba960e4c78daf0018dde8336116c7ab183fb84 Mon Sep 17 00:00:00 2001 From: abose Date: Mon, 1 Sep 2025 07:41:51 +0000 Subject: [PATCH 193/849] ci: update Translations --- src/nls/ar/lastTranslated.json | 1 - src/nls/ar/strings.js | 5 ++--- src/nls/bg/lastTranslated.json | 1 - src/nls/bg/strings.js | 5 ++--- src/nls/cs/lastTranslated.json | 1 - src/nls/cs/strings.js | 5 ++--- src/nls/da/lastTranslated.json | 1 - src/nls/da/strings.js | 5 ++--- src/nls/de/lastTranslated.json | 1 - src/nls/de/strings.js | 5 ++--- src/nls/el/lastTranslated.json | 1 - src/nls/el/strings.js | 5 ++--- src/nls/en-gb/lastTranslated.json | 1 - src/nls/en-gb/strings.js | 5 ++--- src/nls/es/lastTranslated.json | 1 - src/nls/es/strings.js | 5 ++--- src/nls/fa-ir/lastTranslated.json | 1 - src/nls/fa-ir/strings.js | 5 ++--- src/nls/fi/lastTranslated.json | 1 - src/nls/fi/strings.js | 5 ++--- src/nls/fr/lastTranslated.json | 1 - src/nls/fr/strings.js | 5 ++--- src/nls/gl/lastTranslated.json | 1 - src/nls/gl/strings.js | 5 ++--- src/nls/hi/lastTranslated.json | 1 - src/nls/hi/strings.js | 5 ++--- src/nls/hr/lastTranslated.json | 1 - src/nls/hr/strings.js | 5 ++--- src/nls/hu/lastTranslated.json | 1 - src/nls/hu/strings.js | 5 ++--- src/nls/id/lastTranslated.json | 1 - src/nls/id/strings.js | 5 ++--- src/nls/it/lastTranslated.json | 1 - src/nls/it/strings.js | 5 ++--- src/nls/ja/lastTranslated.json | 1 - src/nls/ja/strings.js | 5 ++--- src/nls/ko/lastTranslated.json | 1 - src/nls/ko/strings.js | 5 ++--- src/nls/lv/lastTranslated.json | 1 - src/nls/lv/strings.js | 5 ++--- src/nls/ml/lastTranslated.json | 1 - src/nls/ml/strings.js | 5 ++--- src/nls/nb/lastTranslated.json | 1 - src/nls/nb/strings.js | 5 ++--- src/nls/nl/lastTranslated.json | 1 - src/nls/nl/strings.js | 5 ++--- src/nls/pl/lastTranslated.json | 1 - src/nls/pl/strings.js | 5 ++--- src/nls/pt-br/lastTranslated.json | 1 - src/nls/pt-br/strings.js | 5 ++--- src/nls/pt-pt/lastTranslated.json | 1 - src/nls/pt-pt/strings.js | 5 ++--- src/nls/ro/lastTranslated.json | 1 - src/nls/ro/strings.js | 5 ++--- src/nls/ru/lastTranslated.json | 1 - src/nls/ru/strings.js | 5 ++--- src/nls/sk/lastTranslated.json | 1 - src/nls/sk/strings.js | 5 ++--- src/nls/sr/lastTranslated.json | 1 - src/nls/sr/strings.js | 5 ++--- src/nls/sv/lastTranslated.json | 1 - src/nls/sv/strings.js | 5 ++--- src/nls/tr/lastTranslated.json | 1 - src/nls/tr/strings.js | 5 ++--- src/nls/uk/lastTranslated.json | 1 - src/nls/uk/strings.js | 5 ++--- src/nls/ur/lastTranslated.json | 1 - src/nls/ur/strings.js | 5 ++--- src/nls/zh-cn/lastTranslated.json | 1 - src/nls/zh-cn/strings.js | 5 ++--- src/nls/zh-tw/lastTranslated.json | 1 - src/nls/zh-tw/strings.js | 5 ++--- 72 files changed, 72 insertions(+), 144 deletions(-) diff --git a/src/nls/ar/lastTranslated.json b/src/nls/ar/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/ar/lastTranslated.json +++ b/src/nls/ar/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/ar/strings.js b/src/nls/ar/strings.js index 74cb3cc19f..44d4ee38c4 100644 --- a/src/nls/ar/strings.js +++ b/src/nls/ar/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "لتشغيل المعاينة المباشرة باستخدام ملف من جانب الخادم، يجب تحديد عنوان URL أساسي لهذا المشروع.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "خطأ في بدء تشغيل خادم HTTP لملفات المعاينة المباشرة. الرجاء المحاولة مرة أخرى.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "لمزيد من المعلومات، راجع استكشاف أخطاء اتصال المعاينة المباشرة وإصلاحها.", + "LIVE_PREVIEW_HIDE_OVERLAY": "إخفاء هذه الرسالة", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "المعاينة المباشرة", "LIVE_DEV_STATUS_TIP_PROGRESS1": "معاينة مباشرة: جارٍ الاتصال…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "معاينة مباشرة: جارٍ التهيئة…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "تواصل مع الدعم", "SIGN_OUT": "تسجيل الخروج", "ACCOUNT_DETAILS": "تفاصيل الحساب", - "AI_QUOTA_USED": "حصة الذكاء الاصطناعي المستخدمة", "LOGIN_REFRESH": "تحقق من حالة تسجيل الدخول", "SIGN_IN_WAITING_TITLE": "جارٍ انتظار تسجيل الدخول", "SIGN_IN_WAITING_MESSAGE": "يُرجى إكمال تسجيل الدخول في علامة التبويب الجديدة، ثم العودة إلى هنا.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "اختصار", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "نص القالب", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "الوصف", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "امتداد الملف", - "LIVE_PREVIEW_HIDE_OVERLAY": "إخفاء هذه الرسالة" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "امتداد الملف" }); \ No newline at end of file diff --git a/src/nls/bg/lastTranslated.json b/src/nls/bg/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/bg/lastTranslated.json +++ b/src/nls/bg/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/bg/strings.js b/src/nls/bg/strings.js index c5b1a877d4..24e344ebe1 100644 --- a/src/nls/bg/strings.js +++ b/src/nls/bg/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "За да пуснете прегледа на живо с файл от сървър, трябва да посочите базов адрес за този проект.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Грешка при пускането на HTTP сървъра за преглед на файлове на живо. Моля, опитайте отново.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "За повече информация, вижте Отстраняване на проблеми с връзката на прегледа на живо.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Скрий това съобщение", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Преглед на живо", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Преглед на живо: свързване…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Преглед на живо: установка…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Свържете се с поддръжката", "SIGN_OUT": "Изход", "ACCOUNT_DETAILS": "Данни за акаунта", - "AI_QUOTA_USED": "Използвана AI квота", "LOGIN_REFRESH": "Проверка на състоянието за вход", "SIGN_IN_WAITING_TITLE": "Изчакване за влизане", "SIGN_IN_WAITING_MESSAGE": "Моля, завършете влизането в новия раздел и след това се върнете тук.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Съкращение", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст на шаблон", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Описание", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Разширение на файл", - "LIVE_PREVIEW_HIDE_OVERLAY": "Скрий това съобщение" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Разширение на файл" }); \ No newline at end of file diff --git a/src/nls/cs/lastTranslated.json b/src/nls/cs/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/cs/lastTranslated.json +++ b/src/nls/cs/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index 879a66aa8c..91e83d01cd 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Pro spuštění živého náhledu se vzdáleným souborem, musíte specifikovat URL pro tento projekt.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Chyba při spouštění HTTP serveru pro soubory živého náhledu. Prosím, zkuste to znovu.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Pro více informací navštivte stránku řešení problémů s připojením v Živém náhledu.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Skrýt tuto zprávu", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Živý náhled", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Živý náhled: Připojování…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Živý náhled: Spouštění…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Kontaktovat podporu", "SIGN_OUT": "Odhlásit se", "ACCOUNT_DETAILS": "Detaily účtu", - "AI_QUOTA_USED": "Vyčerpána kvóta pro AI", "LOGIN_REFRESH": "Zkontrolovat stav přihlášení", "SIGN_IN_WAITING_TITLE": "Čekání na přihlášení", "SIGN_IN_WAITING_MESSAGE": "Dokončete prosím přihlášení v nové kartě a poté se sem vraťte.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Zkratka", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text šablony", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Popis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Přípona souboru", - "LIVE_PREVIEW_HIDE_OVERLAY": "Skrýt tuto zprávu" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Přípona souboru" }); \ No newline at end of file diff --git a/src/nls/da/lastTranslated.json b/src/nls/da/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/da/lastTranslated.json +++ b/src/nls/da/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/da/strings.js b/src/nls/da/strings.js index 9102926c44..19cc63f91c 100644 --- a/src/nls/da/strings.js +++ b/src/nls/da/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "For at bruge Live-Forhåndsvisning på en server-side fil, bliver du nødt til at angive en basis-URL for dette projekt.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Fejl ved opstart af HTTP-serveren for Live-Forhåndsvisning. Prøv igen.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "For yderligere information, se Løsningsforslag til forbindelsesfejl vedrørende Live-Forhåndsvisning.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Skjul denne besked", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live-Forhåndsvisning", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live-Forhåndsvisning: Forbinder…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live-Forhåndsvisning: Starter op…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Kontakt support", "SIGN_OUT": "Log ud", "ACCOUNT_DETAILS": "Kontooplysninger", - "AI_QUOTA_USED": "Brugt AI-kvote", "LOGIN_REFRESH": "Tjek loginstatus", "SIGN_IN_WAITING_TITLE": "Venter på login", "SIGN_IN_WAITING_MESSAGE": "Fuldfør venligst login i den nye fane, og vend derefter tilbage hertil.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Forkortelse", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Skabelontekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivelse", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtypenavn", - "LIVE_PREVIEW_HIDE_OVERLAY": "Skjul denne besked" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtypenavn" }); \ No newline at end of file diff --git a/src/nls/de/lastTranslated.json b/src/nls/de/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/de/lastTranslated.json +++ b/src/nls/de/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index dbc873dbab..00518eb337 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Zum Starten der Live-Vorschau mit einer serverseitigen Datei müssen Sie eine Basis-URL für dieses Projekt angeben.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Ein Fehler ist beim Starten des HTTP-Servers oder der Live-Vorschau-Dateien aufgetreten. Bitte versuchen Sie es später erneut.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Weitere Informationen finden Sie unter dem Thema Fehlerbehebung bei Verbindungs-Fehlern der Live-Entwicklung.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Diese Meldung ausblenden", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live-Vorschau", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live-Vorschau: Verbinden…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live-Vorschau: Initialisieren…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Support kontaktieren", "SIGN_OUT": "Abmelden", "ACCOUNT_DETAILS": "Kontodetails", - "AI_QUOTA_USED": "Verbrauchte KI-Quote", "LOGIN_REFRESH": "Anmeldestatus überprüfen", "SIGN_IN_WAITING_TITLE": "Warte auf Anmeldung", "SIGN_IN_WAITING_MESSAGE": "Bitte schließen Sie die Anmeldung im neuen Tab ab und kehren Sie dann hierher zurück.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Kürzel", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Vorlagentext", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beschreibung", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dateierweiterung", - "LIVE_PREVIEW_HIDE_OVERLAY": "Diese Meldung ausblenden" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dateierweiterung" }); \ No newline at end of file diff --git a/src/nls/el/lastTranslated.json b/src/nls/el/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/el/lastTranslated.json +++ b/src/nls/el/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/el/strings.js b/src/nls/el/strings.js index 65da807bae..85258c7632 100644 --- a/src/nls/el/strings.js +++ b/src/nls/el/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Για να ανοίξετε το Live Preview με ένα αρχείο από κάποιον server, πρέπει να προσδιορίσετε μια διεύθυνση (Base URL) για αυτό το project.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Σφάλμα κατά τη διαδικασία εκκίνησης του HTTP server για την άμεση επεξεργασία αρχείων. Παρακαλούμε προσπαθήστε ξανά.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Για περισσότερες πληροφορίες δείτε εδώ: Troubleshooting Live Development connection errors.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Απόκρυψη αυτού του μηνύματος", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: Σύνδεση…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: Εκκίνηση…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Επικοινωνία με την υποστήριξη", "SIGN_OUT": "Αποσύνδεση", "ACCOUNT_DETAILS": "Στοιχεία Λογαριασμού", - "AI_QUOTA_USED": "Χρήση ποσοστού AI", "LOGIN_REFRESH": "Έλεγχος Κατάστασης Σύνδεσης", "SIGN_IN_WAITING_TITLE": "Αναμονή για Σύνδεση", "SIGN_IN_WAITING_MESSAGE": "Ολοκληρώστε τη σύνδεση στην νέα καρτέλα και μετά επιστρέψτε εδώ.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Συντομογραφία", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Κείμενο Προτύπου", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Περιγραφή", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Επέκταση Αρχείου", - "LIVE_PREVIEW_HIDE_OVERLAY": "Απόκρυψη αυτού του μηνύματος" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Επέκταση Αρχείου" }); \ No newline at end of file diff --git a/src/nls/en-gb/lastTranslated.json b/src/nls/en-gb/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/en-gb/lastTranslated.json +++ b/src/nls/en-gb/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/en-gb/strings.js b/src/nls/en-gb/strings.js index 04326f39fc..f2ff730950 100644 --- a/src/nls/en-gb/strings.js +++ b/src/nls/en-gb/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "To launch live preview with a server-side file, you need to specify a Base URL for this project.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Error starting up the HTTP server for live preview files. Please try again.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "For more information, see Troubleshooting Live Preview connection errors.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Dismiss this message", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: Connecting…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: Initialising…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contact support", "SIGN_OUT": "Sign out", "ACCOUNT_DETAILS": "Account Details", - "AI_QUOTA_USED": "AI quota used", "LOGIN_REFRESH": "Check Login Status", "SIGN_IN_WAITING_TITLE": "Waiting for Sign-in", "SIGN_IN_WAITING_MESSAGE": "Please complete sign-in in the new tab, then return here.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abbreviation", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Template Text", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "File Extension", - "LIVE_PREVIEW_HIDE_OVERLAY": "Dismiss this message" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "File Extension" }); \ No newline at end of file diff --git a/src/nls/es/lastTranslated.json b/src/nls/es/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/es/lastTranslated.json +++ b/src/nls/es/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/es/strings.js b/src/nls/es/strings.js index 734d4882e8..fe703117dc 100644 --- a/src/nls/es/strings.js +++ b/src/nls/es/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Necesitas especificar una URL base en este proyecto para poder iniciar la Vista previa dinámica con archivos de servidor.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Error iniciando el servidor HTTP para la Vista previa dinámica. Vuelve a intentarlo, por favor.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Para más información, consulta Resolución de Problemas de conexión en Vista previa dinámica.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Ocultar este mensaje", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Vista previa dinámica", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Vista previa dinámica: Conectando…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Vista previa dinámica: Inicializando…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contactar con soporte técnico", "SIGN_OUT": "Cerrar sesión", "ACCOUNT_DETAILS": "Detalles de la cuenta", - "AI_QUOTA_USED": "Cuota de IA utilizada", "LOGIN_REFRESH": "Verificar estado del inicio de sesión", "SIGN_IN_WAITING_TITLE": "Esperando inicio de sesión", "SIGN_IN_WAITING_MESSAGE": "Completa el inicio de sesión en la nueva pestaña y luego regresa aquí.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviatura", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto de la plantilla", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descripción", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de archivo", - "LIVE_PREVIEW_HIDE_OVERLAY": "Ocultar este mensaje" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de archivo" }); \ No newline at end of file diff --git a/src/nls/fa-ir/lastTranslated.json b/src/nls/fa-ir/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/fa-ir/lastTranslated.json +++ b/src/nls/fa-ir/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 32acf30501..60ae78efde 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "جهت اجرای پیش نمایش زنده بصورت پرونده در سمت سرور(server-side), می بایست یک URL پایه برای پروژه تعریف نمایید.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "خطا در اجرای سرویس دهنده HTTP برای توسعه زنده پرونده ها. لطفا دوباره تلاش کنید", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "برای اطلاعات بیشتر, ببینید عیب یابی خطاهای اتصال پیش نمایش زنده.", + "LIVE_PREVIEW_HIDE_OVERLAY": "پنهان کردن این پیام", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "پیش نمایش زنده", "LIVE_DEV_STATUS_TIP_PROGRESS1": "پیش نمایش زنده: درحال اتصال…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "پیش نمایش زنده: درحال مقداردهی اولیه…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "تماس با پشتیبانی", "SIGN_OUT": "خروج", "ACCOUNT_DETAILS": "جزئیات حساب کاربری", - "AI_QUOTA_USED": "سهمیه هوش مصنوعی استفاده شده", "LOGIN_REFRESH": "بررسی وضعیت ورود", "SIGN_IN_WAITING_TITLE": "در حال انتظار برای ورود", "SIGN_IN_WAITING_MESSAGE": "لطفاً ورود به سیستم را در برگه جدید تکمیل کنید، سپس به اینجا برگردید.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "مخفف", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "متن الگو", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "توضیحات", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "پسوند فایل", - "LIVE_PREVIEW_HIDE_OVERLAY": "پنهان کردن این پیام" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "پسوند فایل" }); \ No newline at end of file diff --git a/src/nls/fi/lastTranslated.json b/src/nls/fi/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/fi/lastTranslated.json +++ b/src/nls/fi/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js index 63966f4d77..bcb623ee07 100644 --- a/src/nls/fi/strings.js +++ b/src/nls/fi/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Jotta voit käynnistää esikatselun palvelimen tiedostolla, täytyy tämän projektin URL-osoite määrittää.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Virhe käynnistettäessä HTTP-palvelinta esikatselun tiedostoille. Yritä uudelleen.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Saat lisätietoja tutustumalla ohjeeseen Troubleshooting Live Preview connection errors.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Piilota tämä viesti", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Esikatselu", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Esikatselu: yhdistetään…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Esikatselu: alustetaan…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Ota yhteyttä tukeen", "SIGN_OUT": "Kirjaudu ulos", "ACCOUNT_DETAILS": "Tilin tiedot", - "AI_QUOTA_USED": "Käytetty tekoälykiintiö", "LOGIN_REFRESH": "Tarkista kirjautumistila", "SIGN_IN_WAITING_TITLE": "Kirjaudutaan sisään", "SIGN_IN_WAITING_MESSAGE": "Viimeistele sisäänkirjautuminen uudessa välilehdessä ja palaa sitten tänne.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Lyhenne", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Malliteksti", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Kuvaus", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Tiedostopääte", - "LIVE_PREVIEW_HIDE_OVERLAY": "Piilota tämä viesti" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Tiedostopääte" }); \ No newline at end of file diff --git a/src/nls/fr/lastTranslated.json b/src/nls/fr/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/fr/lastTranslated.json +++ b/src/nls/fr/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index cb644c329b..167ef07968 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Pour lancer l’Aperçu en direct avec un fichier de serveur, vous devez indiquer une URL de base pour ce projet.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Une erreur s’est produite au démarrage du serveur HTTP pour les fichiers d’aperçu en direct. Veuillez réessayer.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Pour plus d’informations, consultez la page Résolution des erreurs de connexion à l’Aperçu en direct.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Masquer ce message", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Aperçu en direct", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Aperçu en direct : Connexion…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Aperçu en direct : Initialisation…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contacter le support", "SIGN_OUT": "Se déconnecter", "ACCOUNT_DETAILS": "Détails du compte", - "AI_QUOTA_USED": "Quota IA utilisé", "LOGIN_REFRESH": "Vérifier l'état de la connexion", "SIGN_IN_WAITING_TITLE": "En attente de connexion", "SIGN_IN_WAITING_MESSAGE": "Veuillez vous connecter dans le nouvel onglet, puis revenez ici.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abréviation", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texte du modèle", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extension de fichier", - "LIVE_PREVIEW_HIDE_OVERLAY": "Masquer ce message" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extension de fichier" }); \ No newline at end of file diff --git a/src/nls/gl/lastTranslated.json b/src/nls/gl/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/gl/lastTranslated.json +++ b/src/nls/gl/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/gl/strings.js b/src/nls/gl/strings.js index 0cb5d77f58..e9d6e78956 100644 --- a/src/nls/gl/strings.js +++ b/src/nls/gl/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Necesitas especificar unha URL base neste proxecto para poder iniciar Vista Previa en Vivo con arquivos de servidor.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Erro iniciando o servidor HTTP para Vista Previa en Vivo. Volve a intentalo, por favor.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Para máis información, consulta Resolución de Problemas de conexión en Vista Previa en Vivo.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Agochar esta mensaxe", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Vista Previa en Vivo", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Vista Previa en Vivo: Conectando…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Vista Previa en Vivo: Inicializando…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contactar co soporte", "SIGN_OUT": "Pechar sesión", "ACCOUNT_DETAILS": "Detalles da conta", - "AI_QUOTA_USED": "Cota de IA usada", "LOGIN_REFRESH": "Comprobar o estado do inicio de sesión", "SIGN_IN_WAITING_TITLE": "Agardando o inicio de sesión", "SIGN_IN_WAITING_MESSAGE": "Complete o inicio de sesión na nova lapela e logo volva aquí.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviatura", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrición", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de ficheiro", - "LIVE_PREVIEW_HIDE_OVERLAY": "Agochar esta mensaxe" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de ficheiro" }); \ No newline at end of file diff --git a/src/nls/hi/lastTranslated.json b/src/nls/hi/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/hi/lastTranslated.json +++ b/src/nls/hi/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/hi/strings.js b/src/nls/hi/strings.js index 445b30aaad..ccbc89c665 100644 --- a/src/nls/hi/strings.js +++ b/src/nls/hi/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "सर्वर-साइड फ़ाइल के साथ लाइव पूर्वावलोकन लॉन्च करने के लिए, आपको इस प्रोजेक्ट के लिए एक बेस URL निर्दिष्ट करना होगा।", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "लाइव पूर्वावलोकन फ़ाइलों के लिए HTTP सर्वर शुरू करने में त्रुटि। कृपया पुन: प्रयास करें।", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "अधिक जानकारी के लिए, लाइव पूर्वावलोकन कनेक्शन त्रुटियों का निवारण देखें।", + "LIVE_PREVIEW_HIDE_OVERLAY": "इस संदेश को छिपाएँ", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "लाइव पूर्वावलोकन", "LIVE_DEV_STATUS_TIP_PROGRESS1": "लाइव पूर्वावलोकन: कनेक्ट हो रहा है…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "लाइव पूर्वावलोकन: आरंभ हो रहा है…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "सहायता से संपर्क करें", "SIGN_OUT": "साइन आउट करें", "ACCOUNT_DETAILS": "खाता विवरण", - "AI_QUOTA_USED": "एआई कोटा उपयोग किया गया", "LOGIN_REFRESH": "लॉगिन स्थिति जांचें", "SIGN_IN_WAITING_TITLE": "साइन इन की प्रतीक्षा हो रही है", "SIGN_IN_WAITING_MESSAGE": "कृपया नए टैब में साइन-इन पूरा करें, फिर यहां वापस आएं।", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "संक्षिप्त नाम", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "टेम्पलेट टेक्स्ट", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "विवरण", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "फ़ाइल एक्सटेंशन", - "LIVE_PREVIEW_HIDE_OVERLAY": "इस संदेश को छिपाएँ" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "फ़ाइल एक्सटेंशन" }); \ No newline at end of file diff --git a/src/nls/hr/lastTranslated.json b/src/nls/hr/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/hr/lastTranslated.json +++ b/src/nls/hr/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/hr/strings.js b/src/nls/hr/strings.js index b21f167b7e..f4077d8124 100644 --- a/src/nls/hr/strings.js +++ b/src/nls/hr/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Za pokretanje prikaza uživo sa datotekom koja je na serveru, morate navesti osnovnu URL adresu za ovaj projekt.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Greška prilikom pokretanja HTTP servera za prikaz datoteka uživo. Pokušajte ponovo.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Za više informacija, pogledajte Rješavanje grešaka u povezivanju prilikom Prikaza uživo..", + "LIVE_PREVIEW_HIDE_OVERLAY": "Sakrij ovu poruku", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Prikaz uživo", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Prikaz uživo: Povezivanje…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Prikaz uživo: Inicijalizacija…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Kontaktirajte podršku", "SIGN_OUT": "Odjava", "ACCOUNT_DETAILS": "Podaci o računu", - "AI_QUOTA_USED": "Iskorištena AI kvota", "LOGIN_REFRESH": "Provjeri status prijave", "SIGN_IN_WAITING_TITLE": "Prijava u tijeku", "SIGN_IN_WAITING_MESSAGE": "Molimo dovršite prijavu u novoj kartici, a zatim se vratite ovdje.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Kratica", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Tekst predloška", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Opis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstenzija datoteke", - "LIVE_PREVIEW_HIDE_OVERLAY": "Sakrij ovu poruku" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstenzija datoteke" }); \ No newline at end of file diff --git a/src/nls/hu/lastTranslated.json b/src/nls/hu/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/hu/lastTranslated.json +++ b/src/nls/hu/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/hu/strings.js b/src/nls/hu/strings.js index b50936aebf..045231ef9b 100644 --- a/src/nls/hu/strings.js +++ b/src/nls/hu/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Az Élő Előnézet használatához szerver-oldali fájlokkal meg kell adni az alap URL-t a projekthez.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Hiba a HTTP szerver indításakor az Élő Fejlesztéshez. Kérlek próbáld újra később.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "További információért lásd: Élő Előnézet csatlakozási hibák kiküszöbölése.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Üzenet elrejtése", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Élő Előnézet", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Élő Előnézet: Csatlakozás…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Élő Előnézet: Inicializálás…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Ügyfélszolgálattal való kapcsolatfelvétel", "SIGN_OUT": "Kijelentkezés", "ACCOUNT_DETAILS": "Fiókadatok", - "AI_QUOTA_USED": "Felhasznált MI-kvóta", "LOGIN_REFRESH": "Bejelentkezés állapotának ellenőrzése", "SIGN_IN_WAITING_TITLE": "Bejelentkezésre vár", "SIGN_IN_WAITING_MESSAGE": "Kérjük, fejezd be a bejelentkezést az új lapon, majd térj vissza ide.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Rövidítés", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Sablonszöveg", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Leírás", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Fájlkiterjesztés", - "LIVE_PREVIEW_HIDE_OVERLAY": "Üzenet elrejtése" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Fájlkiterjesztés" }); \ No newline at end of file diff --git a/src/nls/id/lastTranslated.json b/src/nls/id/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/id/lastTranslated.json +++ b/src/nls/id/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/id/strings.js b/src/nls/id/strings.js index 452ac2d663..bb24a05806 100644 --- a/src/nls/id/strings.js +++ b/src/nls/id/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Untuk menjalankan tinjauan langsung dengan file sisi-server, Anda perlu mengatur URL Dasar untuk proyek ini.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Gagal menjalankan server HTTP untuk meninjau langsung file. Coba lagi.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Untuk informasi selengkapnya, lihat Mengatasi masalah sambungan Tinjauan Langsung.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Sembunyikan pesan ini", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Tinjauan Langsung", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Tinjauan Langsung: Menyambung…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Tinjauan Langsung: Menginisialisasi…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Hubungi dukungan", "SIGN_OUT": "Keluar", "ACCOUNT_DETAILS": "Detail Akun", - "AI_QUOTA_USED": "Kuota AI terpakai", "LOGIN_REFRESH": "Periksa Status Login", "SIGN_IN_WAITING_TITLE": "Menunggu Masuk", "SIGN_IN_WAITING_MESSAGE": "Silakan selesaikan proses masuk di tab baru, lalu kembali ke sini.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Singkatan", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Teks Templat", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Deskripsi", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstensi Berkas", - "LIVE_PREVIEW_HIDE_OVERLAY": "Sembunyikan pesan ini" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstensi Berkas" }); \ No newline at end of file diff --git a/src/nls/it/lastTranslated.json b/src/nls/it/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/it/lastTranslated.json +++ b/src/nls/it/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index 36e3f60d6e..00d1f70cf6 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Per avviare l'Anteprima Live con un file server-side, è necessario specificare un URL di base per questo progetto.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Errore durante l’avvio del server HTTP server per i file di sviluppo in tempo reale. Riprova ancora.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Per maggiori informazioni leggi Risoluzione dei problemi di connessione a Anteprima Live.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Nascondi questo messaggio", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Anteprima Live", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Anteprima Live: Connessione…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Anteprima Live: Inizializzazione…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contatta l'assistenza", "SIGN_OUT": "Esci", "ACCOUNT_DETAILS": "Dettagli account", - "AI_QUOTA_USED": "Quota IA utilizzata", "LOGIN_REFRESH": "Verifica stato accesso", "SIGN_IN_WAITING_TITLE": "Attendere l'accesso", "SIGN_IN_WAITING_MESSAGE": "Completa l'accesso nella nuova scheda, quindi torna qui.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abbreviazione", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Testo del Modello", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrizione", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Estensione del File", - "LIVE_PREVIEW_HIDE_OVERLAY": "Nascondi questo messaggio" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Estensione del File" }); \ No newline at end of file diff --git a/src/nls/ja/lastTranslated.json b/src/nls/ja/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/ja/lastTranslated.json +++ b/src/nls/ja/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js index 9505bfc26d..0cb6d3eaf1 100644 --- a/src/nls/ja/strings.js +++ b/src/nls/ja/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "サーバー側ファイルでライブプレビューを起動するには、このプロジェクトのベース URL を指定する必要があります。", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "ファイルのライブプレビューで使用する HTTP サーバーの起動時にエラーが発生しました。もう一度実行してください。", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "詳しくは、ライブプレビューの接続エラーに関するトラブルシューティングを参照してください。", + "LIVE_PREVIEW_HIDE_OVERLAY": "このメッセージを非表示にする", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "ライブプレビュー", "LIVE_DEV_STATUS_TIP_PROGRESS1": "ライブプレビュー : 接続中…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "ライブプレビュー : 初期化中…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "サポートに問い合わせる", "SIGN_OUT": "サインアウト", "ACCOUNT_DETAILS": "アカウントの詳細", - "AI_QUOTA_USED": "AI利用量", "LOGIN_REFRESH": "ログイン状態を確認", "SIGN_IN_WAITING_TITLE": "サインインを待機中", "SIGN_IN_WAITING_MESSAGE": "新しいタブでサインインを完了してから、ここに戻ってください。", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "略語", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "テンプレートテキスト", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "説明", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ファイル拡張子", - "LIVE_PREVIEW_HIDE_OVERLAY": "このメッセージを非表示にする" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ファイル拡張子" }); \ No newline at end of file diff --git a/src/nls/ko/lastTranslated.json b/src/nls/ko/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/ko/lastTranslated.json +++ b/src/nls/ko/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/ko/strings.js b/src/nls/ko/strings.js index 74942d2305..ee4d2edaf0 100644 --- a/src/nls/ko/strings.js +++ b/src/nls/ko/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "서버 측 파일 실시간 미리보기를 시작하려면 이 프로젝트의 기본 URL을 지정해야 합니다.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "실시간 미리보기에 사용되는 HTTP 서버를 시작할 때 에러가 발생했습니다. 잠시 후에 다시 시도하세요.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "자세한 내용은 Live Development 연결 오류 문제 해결 를 참조하세요.", + "LIVE_PREVIEW_HIDE_OVERLAY": "이 메시지 숨기기", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "실시간 미리보기", "LIVE_DEV_STATUS_TIP_PROGRESS1": "실시간 미리보기: 연결 중 …", "LIVE_DEV_STATUS_TIP_PROGRESS2": "실시간 미리보기: 초기화 중…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "지원팀에 문의", "SIGN_OUT": "로그아웃", "ACCOUNT_DETAILS": "계정 세부정보", - "AI_QUOTA_USED": "사용된 AI 할당량", "LOGIN_REFRESH": "로그인 상태 확인", "SIGN_IN_WAITING_TITLE": "로그인 대기 중", "SIGN_IN_WAITING_MESSAGE": "새 탭에서 로그인을 완료한 후 여기로 돌아오세요.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "약어", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "템플릿 텍스트", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "설명", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "파일 확장자", - "LIVE_PREVIEW_HIDE_OVERLAY": "이 메시지 숨기기" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "파일 확장자" }); \ No newline at end of file diff --git a/src/nls/lv/lastTranslated.json b/src/nls/lv/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/lv/lastTranslated.json +++ b/src/nls/lv/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/lv/strings.js b/src/nls/lv/strings.js index 06dcaef95d..b55cc43ff2 100644 --- a/src/nls/lv/strings.js +++ b/src/nls/lv/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Lai palaistu tiešo priekšskatījumu ar serverī importētu datni, nepieciešams norādīt šī projekta bāzes URL.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Kļūda, startējot HTTP serveri tiešā priekšskatījuma datnēm. Lūdzu, mēģiniet vēlreiz. ", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Sīkākai informācijai skatiet Tiešā priekšskatījuma savienojuma kļūdu novēršana.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Paslēpt šo ziņojumu", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Tiešais priekšskatījums", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Tiešais priekšskatījums: savienojas…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Tiešais priekšskatījums: inicializē…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Sazināties ar atbalsta dienestu", "SIGN_OUT": "Izrakstīties", "ACCOUNT_DETAILS": "Konta informācija", - "AI_QUOTA_USED": "Izmantotā AI kvota", "LOGIN_REFRESH": "Pārbaudīt pieteikšanās statusu", "SIGN_IN_WAITING_TITLE": "Notiek pieteikšanās", "SIGN_IN_WAITING_MESSAGE": "Lūdzu, pabeidziet pieteikšanos jaunajā cilnē un pēc tam atgriezieties šeit.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Saīsinājums", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Veidnes teksts", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Apraksts", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Faila paplašinājums", - "LIVE_PREVIEW_HIDE_OVERLAY": "Paslēpt šo ziņojumu" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Faila paplašinājums" }); \ No newline at end of file diff --git a/src/nls/ml/lastTranslated.json b/src/nls/ml/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/ml/lastTranslated.json +++ b/src/nls/ml/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/ml/strings.js b/src/nls/ml/strings.js index b0f2707555..480b62ef76 100644 --- a/src/nls/ml/strings.js +++ b/src/nls/ml/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "ഒരു സെർവർ-സൈഡ് ഫയലുമായി ലൈവ് പ്രിവ്യൂ ആരംഭിക്കുന്നതിന്, ഈ പ്രോജക്റ്റിനായി ഒരു ബേസ് യുആർഎൽ നിർവചിക്കേണ്ടതുണ്ട്.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "ലൈവ് പ്രിവ്യൂ ഫയലുകൾക്കായുള്ള HTTP സെർവർ ആരംഭിക്കുന്നതിൽ പിശക്. ദയവായി വീണ്ടും ശ്രമിക്കുക.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "കൂടുതൽ വിവരങ്ങൾക്ക്, ലൈവ് പ്രിവ്യൂ കണക്ഷൻ പിശകുകൾ പരിഹരിക്കൽ കാണുക.", + "LIVE_PREVIEW_HIDE_OVERLAY": "ഈ സന്ദേശം മറയ്ക്കുക", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "ലൈവ് പ്രിവ്യൂ", "LIVE_DEV_STATUS_TIP_PROGRESS1": "ലൈവ് പ്രിവ്യൂ: കണക്റ്റ് ചെയ്യുന്നു…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "ലൈവ് പ്രിവ്യൂ: ഇനിഷ്യലൈസ് ചെയ്യുന്നു…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "പിന്തുണയുമായി ബന്ധപ്പെടുക", "SIGN_OUT": "സൈൻ ഔട്ട് ചെയ്യുക", "ACCOUNT_DETAILS": "അക്കൗണ്ട് വിശദാംശങ്ങൾ", - "AI_QUOTA_USED": "എഐ ക്വാട്ട ഉപയോഗിച്ചു", "LOGIN_REFRESH": "ലോഗിൻ സ്റ്റാറ്റസ് പരിശോധിക്കുക", "SIGN_IN_WAITING_TITLE": "സൈൻ ഇൻ ചെയ്യുന്നതിനായി കാത്തിരിക്കുന്നു", "SIGN_IN_WAITING_MESSAGE": "പുതിയ ടാബിൽ സൈൻ-ഇൻ പൂർത്തിയാക്കി ഇവിടേക്ക് തിരികെ വരിക.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "ചുരുക്കെഴുത്ത്", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "ടെംപ്ലേറ്റ് ടെക്സ്റ്റ്", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "വിവരണം", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ഫയൽ എക്സ്റ്റൻഷൻ", - "LIVE_PREVIEW_HIDE_OVERLAY": "ഈ സന്ദേശം മറയ്ക്കുക" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ഫയൽ എക്സ്റ്റൻഷൻ" }); \ No newline at end of file diff --git a/src/nls/nb/lastTranslated.json b/src/nls/nb/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/nb/lastTranslated.json +++ b/src/nls/nb/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/nb/strings.js b/src/nls/nb/strings.js index 9b1e69d8c9..a759eeea80 100644 --- a/src/nls/nb/strings.js +++ b/src/nls/nb/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "For å starte Live Preview med en server-side fil må du spesifisere en base-url for dette prosjektet.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Feil ved starting av HTTP serveren for Live Preview filer. Vennligst prøv igjen.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "For mer informasjon, se Troubleshooting Live Preview connection errors.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Skjul denne meldingen", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: Kobler til…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: Initaliserer…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Kontakt kundestøtte", "SIGN_OUT": "Logg ut", "ACCOUNT_DETAILS": "Kontodetaljer", - "AI_QUOTA_USED": "AI-kvote brukt", "LOGIN_REFRESH": "Sjekk innloggingsstatus", "SIGN_IN_WAITING_TITLE": "Venter på pålogging", "SIGN_IN_WAITING_MESSAGE": "Fullfør påloggingen i den nye fanen, og returner deretter hit.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Forkortelse", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Maltekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivelse", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtype", - "LIVE_PREVIEW_HIDE_OVERLAY": "Skjul denne meldingen" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtype" }); \ No newline at end of file diff --git a/src/nls/nl/lastTranslated.json b/src/nls/nl/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/nl/lastTranslated.json +++ b/src/nls/nl/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js index 53188625fe..1f5a4cf2d8 100644 --- a/src/nls/nl/strings.js +++ b/src/nls/nl/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Om live voorbeeld te starten met een server-side bestand, moet je een Start URL voor dit project definiëren.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Er is een fout opgetreden bij het opstarten van de HTTP server voor live ontwikkeling bestanden. Probeer alsjeblieft opnieuw.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Voor meer informatie, zie oplossen van Live Voorbeeld verbindingsproblemen.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Dit bericht verbergen", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Voorbeeld", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Voorbeeld: Bezig met verbinden…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Voorbeeld: Initialiseren…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contact opnemen met support", "SIGN_OUT": "Uitloggen", "ACCOUNT_DETAILS": "Accountgegevens", - "AI_QUOTA_USED": "Verbruikt AI-quotum", "LOGIN_REFRESH": "Aanmeldstatus controleren", "SIGN_IN_WAITING_TITLE": "Aanmelden wordt verwerkt", "SIGN_IN_WAITING_MESSAGE": "Voltooi de aanmelding in het nieuwe tabblad en keer hier terug.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Afkorting", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Sjabloontekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beschrijving", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Bestandsextensie", - "LIVE_PREVIEW_HIDE_OVERLAY": "Dit bericht verbergen" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Bestandsextensie" }); \ No newline at end of file diff --git a/src/nls/pl/lastTranslated.json b/src/nls/pl/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/pl/lastTranslated.json +++ b/src/nls/pl/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/pl/strings.js b/src/nls/pl/strings.js index a4dd4cac1d..22ac1be562 100644 --- a/src/nls/pl/strings.js +++ b/src/nls/pl/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Aby uruchomić podgląd na żywo na plikach serwerowych, musisz podać główny adres dla tego projektu (Base URL).", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Błąd przy próbie uruchomienia serwera HTTP dla podglądu na żywo. Spróbuj ponownie.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Więcej informacji znajdziesz na stronie Troubleshooting Live Preview connection errors.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Ukryj tę wiadomość", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Podgląd na żywo", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Podgląd na żywo: łączenie…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Podgląd na żywo: inicjalizacja…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Skontaktuj się z pomocą techniczną", "SIGN_OUT": "Wyloguj się", "ACCOUNT_DETAILS": "Szczegóły konta", - "AI_QUOTA_USED": "Wykorzystany limit AI", "LOGIN_REFRESH": "Sprawdź status logowania", "SIGN_IN_WAITING_TITLE": "Oczekiwanie na logowanie", "SIGN_IN_WAITING_MESSAGE": "Dokończ logowanie w nowej karcie, a następnie wróć tutaj.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Skrót", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Treść szablonu", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Opis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Rozszerzenie pliku", - "LIVE_PREVIEW_HIDE_OVERLAY": "Ukryj tę wiadomość" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Rozszerzenie pliku" }); \ No newline at end of file diff --git a/src/nls/pt-br/lastTranslated.json b/src/nls/pt-br/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/pt-br/lastTranslated.json +++ b/src/nls/pt-br/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/pt-br/strings.js b/src/nls/pt-br/strings.js index 9f44157bcf..e95caa4a88 100644 --- a/src/nls/pt-br/strings.js +++ b/src/nls/pt-br/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Para iniciar um live preview com um arquivo server-side, é preciso especificar uma URL Base para este projeto.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Erro ao iniciar o servidor HTTP para os arquivos do desenvolvimento em tempo real. Por favor, tente novamente.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Para mais informações, veja Solucionando erros de conexão com Live Development.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Ocultar esta mensagem", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: Conectando…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: Inicializando…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contatar o suporte", "SIGN_OUT": "Sair", "ACCOUNT_DETAILS": "Detalhes da Conta", - "AI_QUOTA_USED": "Cota de IA usada", "LOGIN_REFRESH": "Verificar Status de Login", "SIGN_IN_WAITING_TITLE": "Aguardando login", "SIGN_IN_WAITING_MESSAGE": "Conclua o login na nova guia e retorne aqui.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviação", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do Modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrição", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão do Arquivo", - "LIVE_PREVIEW_HIDE_OVERLAY": "Ocultar esta mensagem" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão do Arquivo" }); \ No newline at end of file diff --git a/src/nls/pt-pt/lastTranslated.json b/src/nls/pt-pt/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/pt-pt/lastTranslated.json +++ b/src/nls/pt-pt/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/pt-pt/strings.js b/src/nls/pt-pt/strings.js index 90de2341be..8b0b343e9c 100644 --- a/src/nls/pt-pt/strings.js +++ b/src/nls/pt-pt/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Para iniciar a pré-visualização em tempo real com um ficheiro do lado do servidor, precisa de especificar um URL Base para este projeto.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Erro ao iniciar o servidor HTTP para ficheiros de pré-visualização em tempo real. Por favor, tente novamente.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Para mais informações, consulte Resolução de problemas de ligação da Pré-visualização em Tempo Real.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Ocultar esta mensagem", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: A ligar…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: A iniciar…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contactar o suporte", "SIGN_OUT": "Terminar Sessão", "ACCOUNT_DETAILS": "Detalhes da Conta", - "AI_QUOTA_USED": "Quota de IA utilizada", "LOGIN_REFRESH": "Verificar estado de início de sessão", "SIGN_IN_WAITING_TITLE": "A aguardar início de sessão", "SIGN_IN_WAITING_MESSAGE": "Conclua o início de sessão no novo separador e volte para aqui.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviatura", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do Modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrição", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão de Ficheiro", - "LIVE_PREVIEW_HIDE_OVERLAY": "Ocultar esta mensagem" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão de Ficheiro" }); \ No newline at end of file diff --git a/src/nls/ro/lastTranslated.json b/src/nls/ro/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/ro/lastTranslated.json +++ b/src/nls/ro/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/ro/strings.js b/src/nls/ro/strings.js index 622f475c94..c55b320538 100644 --- a/src/nls/ro/strings.js +++ b/src/nls/ro/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Pentru a lansa Live Preview cu un fișier server-side, e necesar de a specifica un URL de bază pentru acest proiect.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Eroare la lansarea serverului HTTP pentru editarea în direct a fișierelor. Mai încercați o dată.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Pentru mai multe informații, vezi Depanarea erorilor de conexiune în Live Development.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Ascunde acest mesaj", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Previzualizare interactivă", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: Conectare…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: Inițializare…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Contactează asistența", "SIGN_OUT": "Deconectare", "ACCOUNT_DETAILS": "Detalii cont", - "AI_QUOTA_USED": "Cotă AI utilizată", "LOGIN_REFRESH": "Verificare stare autentificare", "SIGN_IN_WAITING_TITLE": "Se așteaptă autentificarea", "SIGN_IN_WAITING_MESSAGE": "Finalizați autentificarea în noua filă, apoi reveniți aici.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviere", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text șablon", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descriere", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensie fișier", - "LIVE_PREVIEW_HIDE_OVERLAY": "Ascunde acest mesaj" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensie fișier" }); \ No newline at end of file diff --git a/src/nls/ru/lastTranslated.json b/src/nls/ru/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/ru/lastTranslated.json +++ b/src/nls/ru/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/ru/strings.js b/src/nls/ru/strings.js index e98e247fdf..4f1447a52b 100644 --- a/src/nls/ru/strings.js +++ b/src/nls/ru/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Для запуска Live Preview с серверным файлом, вы должны указать базовый URL проекта.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Ошибка запуска HTTP сервера для Live Preview. Попытайтесь снова.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Для дополнительной информации, смотрите Поиск и устранение неисправностей ошибок подключения Live Preview.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Скрыть это сообщение", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: Подключение…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: Инициализация…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Связаться с поддержкой", "SIGN_OUT": "Выйти", "ACCOUNT_DETAILS": "Сведения об учетной записи", - "AI_QUOTA_USED": "Использована квота ИИ", "LOGIN_REFRESH": "Проверить статус входа", "SIGN_IN_WAITING_TITLE": "Ожидание входа", "SIGN_IN_WAITING_MESSAGE": "Пожалуйста, завершите вход в новой вкладке, затем вернитесь сюда.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Сокращение", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблона", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Описание", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Расширение файла", - "LIVE_PREVIEW_HIDE_OVERLAY": "Скрыть это сообщение" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Расширение файла" }); \ No newline at end of file diff --git a/src/nls/sk/lastTranslated.json b/src/nls/sk/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/sk/lastTranslated.json +++ b/src/nls/sk/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/sk/strings.js b/src/nls/sk/strings.js index e178b56b52..1924b308b1 100644 --- a/src/nls/sk/strings.js +++ b/src/nls/sk/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Pre spustenie živého náhľadu zo súborom na serveri, musíte špecifikovať URL pre tento projekt.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Chyba pri spúšťaní HTTP severa pre súbory živého náhľadu. Prosím, skúste to znovu.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Pre viac informácií pozrite Riešenie chýb pri pripojení do živého náhľadu.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Skryť túto správu", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Živý náhľad", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Živý náhľad: Pripájanie…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Živý náhľad: Inicializácia…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Kontaktovať podporu", "SIGN_OUT": "Odhlásiť sa", "ACCOUNT_DETAILS": "Detaily účtu", - "AI_QUOTA_USED": "Využité AI kvóty", "LOGIN_REFRESH": "Skontrolovať stav prihlásenia", "SIGN_IN_WAITING_TITLE": "Čaká sa na prihlásenie", "SIGN_IN_WAITING_MESSAGE": "Dokončite prihlásenie v novom okne a potom sa sem vráťte.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Skratka", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text šablóny", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Popis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Prípona súboru", - "LIVE_PREVIEW_HIDE_OVERLAY": "Skryť túto správu" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Prípona súboru" }); \ No newline at end of file diff --git a/src/nls/sr/lastTranslated.json b/src/nls/sr/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/sr/lastTranslated.json +++ b/src/nls/sr/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/sr/strings.js b/src/nls/sr/strings.js index 7c4300ae59..526191fa01 100644 --- a/src/nls/sr/strings.js +++ b/src/nls/sr/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "За покретање живог приказа са датотеком која је \"server-side\", морате навести основну URL адресу за овај пројекат.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Грешка приликом покретања HTTP сервера за \"живе\" развојне датотеке. Молимо покушајте поново.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "За више информација, погледајте Отклањање грешака у конекцији приликом развоја уживо.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Сакриј ову поруку", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Живи приказ", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Живи приказ: Успостављање конекције…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Живи приказ: Иницијализација…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Контактирајте подршку", "SIGN_OUT": "Одјавите се", "ACCOUNT_DETAILS": "Подаци о налогу", - "AI_QUOTA_USED": "Искоришћена AI квота", "LOGIN_REFRESH": "Провери статус пријаве", "SIGN_IN_WAITING_TITLE": "Чека се пријављивање", "SIGN_IN_WAITING_MESSAGE": "Молимо Вас да завршите пријављивање у новом табу, а затим се вратите овде.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Скраћеница", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблона", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Опис", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Екстензија датотеке", - "LIVE_PREVIEW_HIDE_OVERLAY": "Сакриј ову поруку" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Екстензија датотеке" }); \ No newline at end of file diff --git a/src/nls/sv/lastTranslated.json b/src/nls/sv/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/sv/lastTranslated.json +++ b/src/nls/sv/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/sv/strings.js b/src/nls/sv/strings.js index 899a7e0ed5..0cde38ea38 100644 --- a/src/nls/sv/strings.js +++ b/src/nls/sv/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "För att starta förhandsvisningen med en fil innehållande serverkod måste du ange en bas-URL för detta projekt.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Ett fel uppstod när webbsevern för förhandsvisningen skulle startas. Vänligen försök igen.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "För mer information se Troubleshooting Live Development connection errors.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Dölj detta meddelande", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Förhandsvisning", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Förhandsvisning: Ansluter…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Förhandsvisning: Initierar…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Kontakta supporten", "SIGN_OUT": "Logga ut", "ACCOUNT_DETAILS": "Kontodetaljer", - "AI_QUOTA_USED": "Använd AI-kvot", "LOGIN_REFRESH": "Kontrollera inloggningsstatus", "SIGN_IN_WAITING_TITLE": "Väntar på inloggning", "SIGN_IN_WAITING_MESSAGE": "Slutför inloggningen i den nya fliken och återvänd sedan hit.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Förkortning", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Malltext", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivning", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filändelse", - "LIVE_PREVIEW_HIDE_OVERLAY": "Dölj detta meddelande" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filändelse" }); \ No newline at end of file diff --git a/src/nls/tr/lastTranslated.json b/src/nls/tr/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/tr/lastTranslated.json +++ b/src/nls/tr/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/tr/strings.js b/src/nls/tr/strings.js index aab47d47f6..04b29acaa3 100644 --- a/src/nls/tr/strings.js +++ b/src/nls/tr/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Canlı Önizlemeyi server-side dosyalarınız ile açmak istiyorsanız, lütfen bu proje için kullanılabilir bir link belirtiniz.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Canlı önizleme dosyaları için HTTP sunucusu başlatılırken hata oluştu. Lütfen tekrar deneyin.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Detaylı bilgi için lütfen Troubleshooting Live Development connection errors sayfasına bakınız.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Bu mesajı gizle", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Canlı Önizleme", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Canlı Önizleme: Bağlanılıyor…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Canlı Önizleme: Başlıyor…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Destek ekibiyle iletişime geçin", "SIGN_OUT": "Oturumu kapat", "ACCOUNT_DETAILS": "Hesap Ayrıntıları", - "AI_QUOTA_USED": "Yapay Zeka kotası kullanıldı", "LOGIN_REFRESH": "Oturum Durumunu Kontrol Et", "SIGN_IN_WAITING_TITLE": "Oturum Açma Bekleniyor", "SIGN_IN_WAITING_MESSAGE": "Lütfen yeni sekmede oturum açmayı tamamlayın ve buraya geri dönün.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Kısaltma", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Şablon Metni", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Açıklama", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dosya Uzantısı", - "LIVE_PREVIEW_HIDE_OVERLAY": "Bu mesajı gizle" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dosya Uzantısı" }); \ No newline at end of file diff --git a/src/nls/uk/lastTranslated.json b/src/nls/uk/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/uk/lastTranslated.json +++ b/src/nls/uk/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/uk/strings.js b/src/nls/uk/strings.js index 3508649e77..4446a69b5b 100644 --- a/src/nls/uk/strings.js +++ b/src/nls/uk/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "Аби запустити live preview з серверним файлом, вам варто вказати базову адресу для цього проекту.", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "Помилка запуску HTTP-сервера для live preview. Будь ласка, спробуйте пізніше.", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "Для докладнішої інформації погляньте на пошук та усунення помилок підключення Live Preview.", + "LIVE_PREVIEW_HIDE_OVERLAY": "Приховати це повідомлення", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "Live Preview", "LIVE_DEV_STATUS_TIP_PROGRESS1": "Live Preview: Підключення…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "Live Preview: Ініціалізація…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "Звернутися до служби підтримки", "SIGN_OUT": "Вийти", "ACCOUNT_DETAILS": "Дані облікового запису", - "AI_QUOTA_USED": "Використано квоту ШІ", "LOGIN_REFRESH": "Перевірити статус входу", "SIGN_IN_WAITING_TITLE": "Очікування на вхід", "SIGN_IN_WAITING_MESSAGE": "Будь ласка, завершіть вхід у новій вкладці, а потім поверніться сюди.", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Скорочення", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблону", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Опис", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Розширення файлу", - "LIVE_PREVIEW_HIDE_OVERLAY": "Приховати це повідомлення" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Розширення файлу" }); \ No newline at end of file diff --git a/src/nls/ur/lastTranslated.json b/src/nls/ur/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/ur/lastTranslated.json +++ b/src/nls/ur/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/ur/strings.js b/src/nls/ur/strings.js index b684ccbbd9..f02f47b676 100644 --- a/src/nls/ur/strings.js +++ b/src/nls/ur/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "سرور سائیڈ فائل کے ساتھ لائیو پریویو لانچ کرنے کے لیے، آپ کو اس پراجیکٹ کے لیے ایک بیس یو آر ایل بتانا ہوگا۔", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "لائیو پریویو فائلوں کے لیے HTTP سرور شروع کرنے میں خرابی۔ براہ کرم دوبارہ کوشش کریں۔", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "مزید معلومات کے لیے، لائیو پریویو کنکشن کی خرابیوں کا ازالہ دیکھیں۔", + "LIVE_PREVIEW_HIDE_OVERLAY": "یہ پیغام چھپائیں", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "لائیو پریویو", "LIVE_DEV_STATUS_TIP_PROGRESS1": "براہ راست پیش منظر: مربوط ہو رہا ہے…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "براہ راست پیش منظر: شروع ہو رہا ہے…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "سپورٹ سے رابطہ کریں", "SIGN_OUT": "سائن آؤٹ کریں", "ACCOUNT_DETAILS": "اکاؤنٹ کی تفصیلات", - "AI_QUOTA_USED": "استعمال شدہ اے آئی کوٹہ", "LOGIN_REFRESH": "لاگ ان کی حیثیت چیک کریں", "SIGN_IN_WAITING_TITLE": "سائن ان کا انتظار ہے", "SIGN_IN_WAITING_MESSAGE": "براہ کرم نئے ٹیب میں سائن ان مکمل کریں، پھر یہاں واپس آئیں۔", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "مخفف", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "ٹیمپلیٹ متن", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "وضاحت", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "فائل ایکسٹینشن", - "LIVE_PREVIEW_HIDE_OVERLAY": "یہ پیغام چھپائیں" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "فائل ایکسٹینشن" }); \ No newline at end of file diff --git a/src/nls/zh-cn/lastTranslated.json b/src/nls/zh-cn/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/zh-cn/lastTranslated.json +++ b/src/nls/zh-cn/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index a97d26d351..14ac904e36 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "实时预览需要一个服务端, 您需要为这个项目指定一个基本 URL 地址。 (如http://127.0.0.1/)", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "试图启动实时预览 HTTP 服务器时出现错误, 请再试一次。", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "更多信息, 请参考实时预览连接错误信息。", + "LIVE_PREVIEW_HIDE_OVERLAY": "隐藏此消息", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "实时预览", "LIVE_DEV_STATUS_TIP_PROGRESS1": "实时预览: 连接中…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "实时预览: 初始化…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "联系客服", "SIGN_OUT": "退出登录", "ACCOUNT_DETAILS": "帐户详情", - "AI_QUOTA_USED": "AI 配额已用", "LOGIN_REFRESH": "检查登录状态", "SIGN_IN_WAITING_TITLE": "等待登录", "SIGN_IN_WAITING_MESSAGE": "请在新标签页中完成登录，然后返回此处。", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "缩写", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "模板文本", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "描述", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "文件扩展名", - "LIVE_PREVIEW_HIDE_OVERLAY": "隐藏此消息" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "文件扩展名" }); \ No newline at end of file diff --git a/src/nls/zh-tw/lastTranslated.json b/src/nls/zh-tw/lastTranslated.json index 5e5ec5ec1a..ed05f64c99 100644 --- a/src/nls/zh-tw/lastTranslated.json +++ b/src/nls/zh-tw/lastTranslated.json @@ -12,7 +12,6 @@ "ACTION": "Action", "ADD_ENDLINE_TO_THE_END_OF_FILE": "Add endline at the end of file", "ADD_TO_GITIGNORE": "Add to .gitignore", - "AI_QUOTA_USED": "AI quota used", "ALWAYS_OVERWRITE": "Always Overwrite", "AMEND_COMMIT": "Amend last commit", "AMEND_COMMIT_FORBIDDEN": "Cannot amend commit when there are no unpushed commits", diff --git a/src/nls/zh-tw/strings.js b/src/nls/zh-tw/strings.js index 0aa823f1fe..a75c32ecc6 100644 --- a/src/nls/zh-tw/strings.js +++ b/src/nls/zh-tw/strings.js @@ -118,6 +118,7 @@ define({ "LIVE_DEV_NEED_BASEURL_MESSAGE": "您需要指定專案的 URL 根位址，才能啟動包含伺服器端資源的即時預覽功能。", "LIVE_DEV_SERVER_NOT_READY_MESSAGE": "無法啟動即時預覽用的 HTTP 伺服器。請再試一次。", "LIVE_DEVELOPMENT_TROUBLESHOOTING": "想了解更多，請參考即時預覽連結錯誤排解。", + "LIVE_PREVIEW_HIDE_OVERLAY": "隱藏此訊息", "LIVE_DEV_STATUS_TIP_NOT_CONNECTED": "即時預覽", "LIVE_DEV_STATUS_TIP_PROGRESS1": "即時預覽: 連線中…", "LIVE_DEV_STATUS_TIP_PROGRESS2": "即時預覽: 初始化中…", @@ -1405,7 +1406,6 @@ define({ "CONTACT_SUPPORT": "聯絡客服支援", "SIGN_OUT": "登出", "ACCOUNT_DETAILS": "帳號詳細資訊", - "AI_QUOTA_USED": "AI 配額已使用", "LOGIN_REFRESH": "檢查登入狀態", "SIGN_IN_WAITING_TITLE": "等待登入中", "SIGN_IN_WAITING_MESSAGE": "請在新分頁中完成登入，然後返回此處。", @@ -1457,6 +1457,5 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "縮寫", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "範本文字", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "描述", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "檔案副檔名", - "LIVE_PREVIEW_HIDE_OVERLAY": "隱藏此訊息" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "檔案副檔名" }); \ No newline at end of file From 22b99df1f7250625db987bca1c8a0ead9afeabae Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 13:35:21 +0530 Subject: [PATCH 194/849] fix: right clicks on tab bar sometimes opens up editor's context menu --- src/command/DefaultMenus.js | 6 +++++- src/extensionsIntegrated/TabBar/main.js | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js index 5a1e8febaa..e62c756d2e 100644 --- a/src/command/DefaultMenus.js +++ b/src/command/DefaultMenus.js @@ -407,6 +407,10 @@ define(function (require, exports, module) { * an existing selection */ $("#editor-holder").on("contextmenu", function (e) { + // make sure that the click was not made inside a tab bar container + // if it is, then we don't show editor context menu as tab bar has its own + if($(e.target).closest('.tab-bar-container').length) { return; } + require(["editor/EditorManager"], function (EditorManager) { if ($(e.target).parents(".CodeMirror-gutter").length !== 0) { return; @@ -477,4 +481,4 @@ define(function (require, exports, module) { Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU).on("beforeContextMenuOpen", _setMenuItemsVisible); Menus.getContextMenu(Menus.ContextMenuIds.PROJECT_MENU).on("beforeContextMenuOpen", _setMenuItemsVisible); }); -}); \ No newline at end of file +}); diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index e6f6494d46..2e571fb5d7 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -511,6 +511,9 @@ define(function (require, exports, module) { // delegate event handling for both tab bars $(document).on("mousedown", ".phoenix-tab-bar .tab", function (event) { + // to prevent right clicks activate the mousedown event + if (event.button === 2) { return; } + if ($(event.target).hasClass("fa-times") || $(event.target).closest(".tab-close").length) { return; } From 0205cc8f974ffe499da14ad3c98d8d119f165b8f Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 15:35:30 +0530 Subject: [PATCH 195/849] fix: drag indicators not coming at expected places --- src/extensionsIntegrated/TabBar/drag-drop.js | 998 ++++++------------- 1 file changed, 313 insertions(+), 685 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/drag-drop.js b/src/extensionsIntegrated/TabBar/drag-drop.js index 578ce516a9..53bcb50062 100644 --- a/src/extensionsIntegrated/TabBar/drag-drop.js +++ b/src/extensionsIntegrated/TabBar/drag-drop.js @@ -28,15 +28,11 @@ define(function (require, exports, module) { /** * These variables track the drag and drop state of tabs * draggedTab: The tab that is currently being dragged - * dragOverTab: The tab that is currently being hovered over * dragIndicator: Visual indicator showing where the tab will be dropped - * scrollInterval: Used for automatic scrolling when dragging near edges * dragSourcePane: To track which pane the dragged tab originated from */ let draggedTab = null; - let dragOverTab = null; let dragIndicator = null; - let scrollInterval = null; let dragSourcePane = null; /** @@ -51,586 +47,244 @@ define(function (require, exports, module) { // this is to make sure that the drag indicator is hidden and remove any inline styles if (dragIndicator) { dragIndicator.hide().css({ - top: '', - left: '', - height: '' + top: "", + left: "", + height: "" }); } // Reset all drag state variables draggedTab = null; - dragOverTab = null; dragSourcePane = null; - if (scrollInterval) { - clearInterval(scrollInterval); - scrollInterval = null; - } - - $("#tab-drag-extended-zone").remove(); - - // this is needed to make sure that all the drag-active styling are properly hidden - // it is required because noticed a bug where sometimes some styles remain when drop fails - $(".phoenix-tab-bar").removeClass("drag-active"); - - setTimeout(() => { - // a double check just to make sure that the drag indicator is still hidden - if (dragIndicator && dragIndicator.is(':visible')) { - dragIndicator.hide(); - } - }, 5); + // remove any temporary elements + $("#tab-drag-helper").remove(); } /** - * Initialize drag and drop functionality for tab bars - * This is called from `main.js` - * This function sets up event listeners for both panes' tab bars - * and creates the visual drag indicator - * - * @param {String} firstPaneSelector - Selector for the first pane tab bar $("#phoenix-tab-bar") - * @param {String} secondPaneSelector - Selector for the second pane tab bar $("#phoenix-tab-bar-2") + * create the drag indicator if it doesn't exist */ - function init(firstPaneSelector, secondPaneSelector) { - setupDragForTabBar(firstPaneSelector); - setupDragForTabBar(secondPaneSelector); - setupContainerDrag(firstPaneSelector); - setupContainerDrag(secondPaneSelector); - - // Create drag indicator element if it doesn't exist - if (!dragIndicator) { + function ensureDragIndicator() { + if (!dragIndicator || !dragIndicator.length) { dragIndicator = $('
'); $("body").append(dragIndicator); } - - // add initialization for empty panes - initEmptyPaneDropTargets(); - - // Set up global drag cleanup handlers to ensure drag state is always cleaned up - setupGlobalDragCleanup(); } /** - * Setup drag and drop for a specific tab bar - * Makes tabs draggable and adds all the necessary event listeners - * - * @param {String} tabBarSelector - The selector for the tab bar + * this function is to update the drag indicator position + * @param {Element} targetTab - The target tab element + * @param {boolean} insertBefore - Whether to insert before the target tab */ - function setupDragForTabBar(tabBarSelector) { - const $tabs = $(tabBarSelector).find(".tab"); + function updateDragIndicator(targetTab, insertBefore) { + if (!targetTab) { + dragIndicator.hide(); + return; + } - // Make tabs draggable - $tabs.attr("draggable", "true"); - - // Remove any existing event listeners first to prevent duplicates - // This is important when the tab bar is recreated or updated - $tabs.off("dragstart dragover dragenter dragleave drop dragend"); - - // Add drag event listeners to each tab - // Each event has its own handler function for better organization - $tabs.on("dragstart", handleDragStart); - $tabs.on("dragover", handleDragOver); - $tabs.on("dragenter", handleDragEnter); - $tabs.on("dragleave", handleDragLeave); - $tabs.on("drop", handleDrop); - $tabs.on("dragend", handleDragEnd); + const rect = targetTab.getBoundingClientRect(); + const x = insertBefore ? rect.left : rect.right; + + dragIndicator + .css({ + position: "fixed", + left: x + "px", + top: rect.top + "px", + height: rect.height + "px", + width: "2px", + zIndex: 10001 + }) + .show(); } /** - * Setup container-level drag events - * This enables dropping tabs in empty spaces and auto-scrolling - * when dragging near the container's edges - * - * @param {String} containerSelector - The selector for the tab bar container + * get the drop position relative to a target tab + * @param {Element} targetTab - The target tab element + * @param {number} mouseX - The mouse X coordinate + * @returns {boolean} True if should insert before, false if after */ - function setupContainerDrag(containerSelector) { - const $container = $(containerSelector); - let lastKnownMousePosition = { x: 0 }; - const boundaryTolerance = 50; // px tolerance outside the container that still allows dropping - - // create a larger drop zone around the container - // this is done to make sure that even if the tab is not exactly over the tab bar, we still allow drag-drop - const createOuterDropZone = () => { - if (draggedTab && !$("#tab-drag-extended-zone").length) { - // an invisible larger zone around the container that can still receive drops - const containerRect = $container[0].getBoundingClientRect(); - const $outerZone = $('
').css({ - position: "fixed", - top: containerRect.top - boundaryTolerance, - left: containerRect.left - boundaryTolerance, - width: containerRect.width + boundaryTolerance * 2, - height: containerRect.height + boundaryTolerance * 2, - zIndex: 9999, - pointerEvents: "all" - }); - - $("body").append($outerZone); - - $outerZone.on("dragover", function (e) { - e.preventDefault(); - e.stopPropagation(); - lastKnownMousePosition.x = e.originalEvent.clientX; - - autoScrollContainer($container[0], lastKnownMousePosition.x); - - updateDragIndicatorFromOuterZone($container, lastKnownMousePosition.x); - - return false; - }); - - $outerZone.on("drop", function (e) { - e.preventDefault(); - e.stopPropagation(); - - // to handle drop the same way as if it happened in the container - handleOuterZoneDrop($container, lastKnownMousePosition.x); - - return false; - }); - } - }; - - // When dragging over the container but not directly over a tab element - $container.on("dragover", function (e) { - if (e.preventDefault) { - e.preventDefault(); - } - - lastKnownMousePosition.x = e.originalEvent.clientX; - - // Clear any existing scroll interval - if (scrollInterval) { - clearInterval(scrollInterval); - } - - // auto-scroll if near container edge - autoScrollContainer(this, e.originalEvent.clientX); - - // Set up interval for continuous scrolling while dragging near the edge - scrollInterval = setInterval(() => { - if (draggedTab) { - // Only continue scrolling if still dragging - autoScrollContainer(this, lastKnownMousePosition.x); - } else { - clearInterval(scrollInterval); - scrollInterval = null; - } - }, 16); // this is almost about 60fps - - // if the target is not a tab, update the drag indicator using the container bounds - if ($(e.target).closest(".tab").length === 0) { - const containerRect = this.getBoundingClientRect(); - const mouseX = e.originalEvent.clientX; - - // determine if dropping on left or right half of container - const onLeftSide = mouseX < containerRect.left + containerRect.width / 2; - - const $tabs = $container.find(".tab"); - if ($tabs.length) { - // choose the first tab for left drop, last tab for right drop - const targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; - updateDragIndicator(targetTab, onLeftSide); - } - } - - // Create the extended drop zone if we're actively dragging - if (draggedTab) { - createOuterDropZone(); - } - }); - - // handle drop on the container (empty space) - $container.on("drop", function (e) { - if (e.preventDefault) { - e.preventDefault(); - } - - // get container dimensions to determine drop position - const containerRect = this.getBoundingClientRect(); - const mouseX = e.originalEvent.clientX; - // determine if dropping on left or right half of container - const onLeftSide = mouseX < containerRect.left + containerRect.width / 2; - - const $tabs = $container.find(".tab"); - if ($tabs.length) { - // If dropping on left half, target the first tab; otherwise, target the last tab - const targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; - - // make sure that the draggedTab exists and isn't the same as the target - if (draggedTab && targetTab && draggedTab !== targetTab) { - // check which pane the container belongs to - const isSecondPane = $container.attr("id") === "phoenix-tab-bar-2"; - const targetPaneId = isSecondPane ? "second-pane" : "first-pane"; - const draggedPath = $(draggedTab).attr("data-path"); - const targetPath = $(targetTab).attr("data-path"); - - // check if we're dropping in a different pane - if (dragSourcePane !== targetPaneId) { - // cross-pane drop - moveTabBetweenPanes(dragSourcePane, targetPaneId, draggedPath, targetPath, onLeftSide); - } else { - // same pane drop - moveWorkingSetItem(targetPaneId, draggedPath, targetPath, onLeftSide); - } - } - } - - // ensure all drag state is cleaned up - cleanupDragState(); - }); - - /** - * Updates the drag indicator when mouse is in the extended zone (outside actual tab bar) - * @param {jQuery} $container - The tab bar container - * @param {number} mouseX - Current mouse X position - */ - function updateDragIndicatorFromOuterZone($container, mouseX) { - const containerRect = $container[0].getBoundingClientRect(); - const $tabs = $container.find(".tab"); - - if ($tabs.length) { - // Determine if dropping on left half or right half - let onLeftSide = true; - let targetTab; - - // If beyond the right edge, use the last tab - if (mouseX > containerRect.right) { - targetTab = $tabs.last()[0]; - onLeftSide = false; - } else if (mouseX < containerRect.left) { // If beyond the left edge, use the first tab - targetTab = $tabs.first()[0]; - onLeftSide = true; - } else { // If within bounds, find the closest tab - onLeftSide = mouseX < containerRect.left + containerRect.width / 2; - targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; - } - - updateDragIndicator(targetTab, onLeftSide); - } - } - - /** - * Handles drops that occur in the extended drop zone - * @param {jQuery} $container - The tab bar container - * @param {number} mouseX - Current mouse X position - */ - function handleOuterZoneDrop($container, mouseX) { - const containerRect = $container[0].getBoundingClientRect(); - const $tabs = $container.find(".tab"); - - if ($tabs.length && draggedTab) { - // Determine drop position similar to updateDragIndicatorFromOuterZone - let onLeftSide = true; - let targetTab; - - if (mouseX > containerRect.right) { - targetTab = $tabs.last()[0]; - onLeftSide = false; - } else if (mouseX < containerRect.left) { - targetTab = $tabs.first()[0]; - onLeftSide = true; - } else { - onLeftSide = mouseX < containerRect.left + containerRect.width / 2; - targetTab = onLeftSide ? $tabs.first()[0] : $tabs.last()[0]; - } - - // Process the drop - const isSecondPane = $container.attr("id") === "phoenix-tab-bar-2"; - const targetPaneId = isSecondPane ? "second-pane" : "first-pane"; - const draggedPath = $(draggedTab).attr("data-path"); - const targetPath = $(targetTab).attr("data-path"); - - if (dragSourcePane !== targetPaneId) { - // cross-pane drop - moveTabBetweenPanes(dragSourcePane, targetPaneId, draggedPath, targetPath, onLeftSide); - } else { - // same pane drop - moveWorkingSetItem(targetPaneId, draggedPath, targetPath, onLeftSide); - } - } - - cleanupDragState(); - } + function getDropPosition(targetTab, mouseX) { + const rect = targetTab.getBoundingClientRect(); + const midpoint = rect.left + rect.width / 2; + return mouseX < midpoint; } /** - * enhanced auto-scroll function for container when the mouse is near its left or right edge - * creates a smooth scrolling effect with speed based on proximity to the edge - * - * @param {HTMLElement} container - The scrollable container element - * @param {Number} mouseX - The current mouse X coordinate + * find the closest tab to mouse position + * @param {jQuery} container - The tab container element + * @param {number} mouseX - The mouse X coordinate + * @returns {Element|null} The closest tab element or null */ - function autoScrollContainer(container, mouseX) { - const rect = container.getBoundingClientRect(); - const edgeThreshold = 100; // Increased threshold for edge detection (was 50) - const outerThreshold = 50; // Distance outside the container that still triggers scrolling - - // Calculate distance from edges, allowing for mouse to be slightly outside bounds - const distanceFromLeft = mouseX - (rect.left - outerThreshold); - const distanceFromRight = rect.right + outerThreshold - mouseX; - - // Determine scroll speed based on distance from edge (closer = faster scroll) - let scrollSpeed = 0; - - // Only activate scrolling when within the threshold (including the outer buffer) - if (distanceFromLeft < edgeThreshold + outerThreshold && mouseX < rect.right) { - // Non-linear scroll speed: faster as you get closer to the edge - scrollSpeed = -Math.pow(1 - distanceFromLeft / (edgeThreshold + outerThreshold), 2) * 25; - } else if (distanceFromRight < edgeThreshold + outerThreshold && mouseX > rect.left) { - scrollSpeed = Math.pow(1 - distanceFromRight / (edgeThreshold + outerThreshold), 2) * 25; - } + function findClosestTab(container, mouseX) { + const tabs = container.find(".tab").get(); + let closestTab = null; + let closestDistance = Infinity; + + for (let tab of tabs) { + if (tab === draggedTab) { + continue; + } - // Apply scrolling if needed - if (scrollSpeed !== 0) { - container.scrollLeft += scrollSpeed; + const rect = tab.getBoundingClientRect(); + const tabCenter = rect.left + rect.width / 2; + const distance = Math.abs(mouseX - tabCenter); - // If we're already at the edge, don't keep trying to scroll - if ( - (scrollSpeed < 0 && container.scrollLeft <= 0) || - (scrollSpeed > 0 && container.scrollLeft >= container.scrollWidth - container.clientWidth) - ) { - return; + if (distance < closestDistance) { + closestDistance = distance; + closestTab = tab; } } + + return closestTab; } /** - * Handle the start of a drag operation - * Stores the tab being dragged and adds visual styling - * - * @param {Event} e - The event object + * this function handles the drag start + * @param {Event} event - the event instance */ - function handleDragStart(e) { - if (draggedTab) { - cleanupDragState(); - } - - // store reference to the dragged tab + function handleDragStart(event) { draggedTab = this; - - // set data transfer (required for Firefox) - // Firefox requires data to be set for the drag operation to work - e.originalEvent.dataTransfer.effectAllowed = "move"; - e.originalEvent.dataTransfer.setData("text/html", this.innerHTML); - - // Store which pane this tab came from dragSourcePane = $(this).closest("#phoenix-tab-bar-2").length > 0 ? "second-pane" : "first-pane"; - // Add dragging class for styling + // Set up drag data + event.originalEvent.dataTransfer.effectAllowed = "move"; + event.originalEvent.dataTransfer.setData("application/x-phoenix-tab", "tab-drag"); + + // Add visual styling $(this).addClass("dragging"); - // Use a timeout to let the dragging class apply before taking measurements - // This ensures visual updates are applied before we calculate positions + ensureDragIndicator(); + + // Small delay to let the dragging class take effect setTimeout(() => { - // Ensure the drag indicator is properly hidden at the start - if (dragIndicator) { - dragIndicator.hide(); - } - }, 0); + dragIndicator.hide(); + }, 10); } /** - * Handle the dragover event to enable drop - * Updates the visual indicator showing where the tab will be dropped - * - * @param {Event} e - The event object + * this function handles the drag over + * @param {Event} event - the event instance */ - function handleDragOver(e) { - if (e.preventDefault) { - e.preventDefault(); // Allows us to drop + function handleDragOver(event) { + if (!draggedTab) { + return; } - e.originalEvent.dataTransfer.dropEffect = "move"; - // Update the drag indicator position - // We need to determine if it should be on the left or right side of the target tab - const targetRect = this.getBoundingClientRect(); - const mouseX = e.originalEvent.clientX; - const midPoint = targetRect.left + targetRect.width / 2; - const onLeftSide = mouseX < midPoint; + event.preventDefault(); + event.originalEvent.dataTransfer.dropEffect = "move"; - updateDragIndicator(this, onLeftSide); + const targetTab = event.currentTarget; + if (targetTab === draggedTab) { + return; + } - return false; - } + const insertBefore = getDropPosition(targetTab, event.originalEvent.clientX); + updateDragIndicator(targetTab, insertBefore); - /** - * Handle entering a potential drop target - * Applies styling to indicate the current drop target - * - * @param {Event} e - The event object - */ - function handleDragEnter(e) { - dragOverTab = this; - $(this).addClass("drag-target"); + // Clear any existing drag-target classes + $(".tab").removeClass("drag-target"); + $(targetTab).addClass("drag-target"); } /** - * Handle leaving a potential drop target - * Removes styling when no longer hovering over a drop target - * - * @param {Event} e - The event object + * handles the container drag over (for empty space drops) + * @param {Event} event */ - function handleDragLeave(e) { - const relatedTarget = e.originalEvent.relatedTarget; - // Only remove the class if we're truly leaving this tab - // This prevents flickering when moving over child elements - if (!$(this).is(relatedTarget) && !$(this).has(relatedTarget).length) { - $(this).removeClass("drag-target"); - if (dragOverTab === this) { - dragOverTab = null; - } + function handleContainerDragOver(event) { + if (!draggedTab) { + return; } - } - /** - * Handle dropping a tab onto a target - * Moves the file in the working set to the new position - * - * @param {Event} e - The event object - */ - function handleDrop(e) { - try { - if (e.stopPropagation) { - e.stopPropagation(); // Stops browser from redirecting - } + event.preventDefault(); - // Only process the drop if the dragged tab is different from the drop target - if (draggedTab !== this) { - // Determine which pane the drop target belongs to - const isSecondPane = $(this).closest("#phoenix-tab-bar-2").length > 0; - const targetPaneId = isSecondPane ? "second-pane" : "first-pane"; - const draggedPath = $(draggedTab).attr("data-path"); - const targetPath = $(this).attr("data-path"); - - // Determine if we're dropping to the left or right of the target - const targetRect = this.getBoundingClientRect(); - const mouseX = e.originalEvent.clientX; - const midPoint = targetRect.left + targetRect.width / 2; - const onLeftSide = mouseX < midPoint; - - // Check if dragging between different panes - if (dragSourcePane !== targetPaneId) { - // Move the tab between panes - moveTabBetweenPanes(dragSourcePane, targetPaneId, draggedPath, targetPath, onLeftSide); - } else { - // Move within the same pane - moveWorkingSetItem(targetPaneId, draggedPath, targetPath, onLeftSide); - } - } + const container = $(this); + const mouseX = event.originalEvent.clientX; + const closestTab = findClosestTab(container, mouseX); - cleanupDragState(); - return false; - } catch (error) { - console.error("Error during tab drop operation:", error); - // Ensure cleanup happens even if there's an error - cleanupDragState(); - return false; + if (closestTab) { + const insertBefore = getDropPosition(closestTab, mouseX); + updateDragIndicator(closestTab, insertBefore); + + // Clear existing classes and add to closest + $(".tab").removeClass("drag-target"); + $(closestTab).addClass("drag-target"); + } else { + dragIndicator.hide(); } } /** - * Handle the end of a drag operation - * Cleans up classes and resets state variables - * - * @param {Event} e - The event object + * this handles the drop + * @param {Event} event */ - function handleDragEnd(e) { - setTimeout(() => { + function handleDrop(event) { + event.preventDefault(); + event.stopPropagation(); + + if (!draggedTab || this === draggedTab) { cleanupDragState(); - }, 10); + return; + } + + const targetTab = this; + const targetPaneId = $(targetTab).closest("#phoenix-tab-bar-2").length > 0 ? "second-pane" : "first-pane"; + const insertBefore = getDropPosition(targetTab, event.originalEvent.clientX); + + performTabMove(targetTab, targetPaneId, insertBefore); + cleanupDragState(); } /** - * Global document event listeners to ensure drag state is always cleaned up - * This handles cases where drag operations fail or are cancelled outside - * the normal tab bar drop zones + * this function handles the drop on container (empty space) + * @param {Event} event */ - function setupGlobalDragCleanup() { - // Listen for drags ending anywhere on the document - $(document).on('dragend', function(e) { - // Only clean up if we were tracking a drag operation - if (draggedTab) { - setTimeout(() => { - cleanupDragState(); - }, 10); - } - }); + function handleContainerDrop(event) { + event.preventDefault(); - // Listen for global mouse up events to catch cancelled drags - $(document).on('mouseup', function(e) { - // If we have an active drag but mouse is released, clean up - if (draggedTab && !e.originalEvent.dataTransfer) { - setTimeout(() => { - cleanupDragState(); - }, 10); - } - }); + if (!draggedTab) { + cleanupDragState(); + return; + } - // Listen for ESC key to cancel drag operations - $(document).on('keydown', function(e) { - if (e.key === 'Escape' && draggedTab) { - cleanupDragState(); - } - }); + const container = $(this); + const mouseX = event.originalEvent.clientX; + const closestTab = findClosestTab(container, mouseX); - // Listen for page visibility changes (like alt-tab) to clean up - $(document).on('visibilitychange', function() { - if (document.hidden && draggedTab) { - cleanupDragState(); - } - }); + if (closestTab) { + const targetPaneId = container.attr("id") === "phoenix-tab-bar-2" ? "second-pane" : "first-pane"; + const insertBefore = getDropPosition(closestTab, mouseX); + performTabMove(closestTab, targetPaneId, insertBefore); + } + + cleanupDragState(); } /** - * Update the drag indicator position and visibility - * The indicator shows where the tab will be dropped - * Ensures the indicator stays within the bounds of the tab bar - * - * @param {HTMLElement} targetTab - The tab being dragged over, or null to hide - * @param {Boolean} onLeftSide - Whether the indicator should be on the left or right side + * this function performs the actual tab move + * it can be of two types: tab move in same pane, tab move between different panes + * @param {Element} targetTab - The target tab element + * @param {string} targetPaneId - The target pane ID + * @param {boolean} insertBefore - Whether to insert before the target */ - function updateDragIndicator(targetTab, onLeftSide) { - if (!targetTab) { - dragIndicator.hide(); - return; - } + function performTabMove(targetTab, targetPaneId, insertBefore) { + const draggedPath = $(draggedTab).attr("data-path"); + const targetPath = $(targetTab).attr("data-path"); - // Get the target tab's position and size - const targetRect = targetTab.getBoundingClientRect(); - - // Find the containing tab bar to ensure the indicator stays within bounds - const $tabBar = $(targetTab).closest("#phoenix-tab-bar, #phoenix-tab-bar-2"); - const tabBarRect = $tabBar[0] ? $tabBar[0].getBoundingClientRect() : null; - - if (onLeftSide) { - // Position indicator at the left edge of the target tab - // Ensure it doesn't go beyond the tab bar's left edge - const leftPos = tabBarRect ? Math.max(targetRect.left, tabBarRect.left) : targetRect.left; - dragIndicator.css({ - top: targetRect.top, - left: leftPos, - height: targetRect.height - }); + if (dragSourcePane === targetPaneId) { + // same pane move + moveWorkingSetItem(targetPaneId, draggedPath, targetPath, insertBefore); } else { - // Position indicator at the right edge of the target tab - // Ensure it doesn't go beyond the tab bar's right edge - const rightPos = tabBarRect ? Math.min(targetRect.right, tabBarRect.right) : targetRect.right; - dragIndicator.css({ - top: targetRect.top, - left: rightPos, - height: targetRect.height - }); + // different pane move + moveTabBetweenPanes(dragSourcePane, targetPaneId, draggedPath, targetPath, insertBefore); } - dragIndicator.show(); } /** - * Move an item in the working set - * This function actually performs the reordering of tabs - * - * @param {String} paneId - The ID of the pane ("first-pane" or "second-pane") - * @param {String} draggedPath - Path of the dragged file - * @param {String} targetPath - Path of the drop target file - * @param {Boolean} beforeTarget - Whether to place before or after the target + * this function is responsible to move the tab within the pane + * @param {string} paneId - The pane ID + * @param {string} draggedPath - The path of the dragged file + * @param {string} targetPath - The path of the target file + * @param {boolean} beforeTarget - Whether to insert before the target */ function moveWorkingSetItem(paneId, draggedPath, targetPath, beforeTarget) { const workingSet = MainViewManager.getWorkingSet(paneId); @@ -647,43 +301,34 @@ define(function (require, exports, module) { } } - // Only move if we found both items if (draggedIndex !== -1 && targetIndex !== -1) { - // Calculate the new position based on whether we're inserting before or after the target let newPosition = beforeTarget ? targetIndex : targetIndex + 1; - // Adjust position if the dragged item is before the target - // This is necessary because removing the dragged item will shift all following items if (draggedIndex < newPosition) { newPosition--; } - // Perform the actual move in the MainViewManager MainViewManager._moveWorkingSetItem(paneId, draggedIndex, newPosition); } } /** - * Move a tab from one pane to another - * This function handles cross-pane drag and drop operations - * - * @param {String} sourcePaneId - The ID of the source pane ("first-pane" or "second-pane") - * @param {String} targetPaneId - The ID of the target pane ("first-pane" or "second-pane") - * @param {String} draggedPath - Path of the dragged file - * @param {String} targetPath - Path of the drop target file (in the target pane) - * @param {Boolean} beforeTarget - Whether to place before or after the target + * this function is responsible to move the tab in between different panes + * @param {string} sourcePaneId - The source pane ID + * @param {string} targetPaneId - The target pane ID + * @param {string} draggedPath - The path of the dragged file + * @param {string} targetPath - The path of the target file + * @param {boolean} beforeTarget - Whether to insert before the target */ function moveTabBetweenPanes(sourcePaneId, targetPaneId, draggedPath, targetPath, beforeTarget) { try { const sourceWorkingSet = MainViewManager.getWorkingSet(sourcePaneId); const targetWorkingSet = MainViewManager.getWorkingSet(targetPaneId); - let draggedIndex = -1; - let targetIndex = -1; let draggedFile = null; + let targetIndex = -1; // Find the dragged file and its index in the source pane for (let i = 0; i < sourceWorkingSet.length; i++) { if (sourceWorkingSet[i].fullPath === draggedPath) { - draggedIndex = i; draggedFile = sourceWorkingSet[i]; break; } @@ -697,222 +342,205 @@ define(function (require, exports, module) { } } - // Only continue if we found the dragged file - if (draggedIndex !== -1 && draggedFile) { - // Check if the dragged file is currently active in the source pane - const currentActiveFileInSource = MainViewManager.getCurrentlyViewedFile(sourcePaneId); - const isActiveFileBeingMoved = currentActiveFileInSource && - currentActiveFileInSource.fullPath === draggedPath; - - // If the active file is being moved and there are other files in the source pane, - // switch to another file first to prevent placeholder creation - if (isActiveFileBeingMoved && sourceWorkingSet.length > 1) { - // Find another file to make active (prefer the next file, or previous if this is the last) - let newActiveIndex = draggedIndex + 1; - if (newActiveIndex >= sourceWorkingSet.length) { - newActiveIndex = draggedIndex - 1; - } - - if (newActiveIndex >= 0 && newActiveIndex < sourceWorkingSet.length) { - const newActiveFile = sourceWorkingSet[newActiveIndex]; - // Open the new active file in the source pane before removing the dragged file - CommandManager.execute(Commands.FILE_OPEN, { - fullPath: newActiveFile.fullPath, - paneId: sourcePaneId - }); - } - } - - // Remove the file from source pane + if (draggedFile) { + // Close in source pane CommandManager.execute(Commands.FILE_CLOSE, { file: draggedFile, paneId: sourcePaneId }); - // Calculate where to add it in the target pane - let targetInsertIndex; - - if (targetIndex !== -1) { - // We have a specific target index to aim for - targetInsertIndex = beforeTarget ? targetIndex : targetIndex + 1; - } else { - // No specific target, add to end of the working set - targetInsertIndex = targetWorkingSet.length; - } - - // Add to the target pane at the calculated position - MainViewManager.addToWorkingSet(targetPaneId, draggedFile, targetInsertIndex); + // calculate where to insert it in the target pane + const insertIndex = + targetIndex !== -1 ? (beforeTarget ? targetIndex : targetIndex + 1) : targetWorkingSet.length; - // we always need to make the dragged tab active in the target pane when moving between panes + // Add to target pane + MainViewManager.addToWorkingSet(targetPaneId, draggedFile, insertIndex); CommandManager.execute(Commands.FILE_OPEN, { fullPath: draggedPath, paneId: targetPaneId }); } } catch (error) { console.error("Error during cross-pane tab move:", error); - // Even if there's an error, ensure the drag state is cleaned up - cleanupDragState(); } } /** - * Initialize drop targets for empty panes - * This creates invisible drop zones when a pane has no files and thus no tab bar + * this function handles the drag end event + * @param {Event} event - the event instance */ - function initEmptyPaneDropTargets() { - // get the references to the editor holders (these are always present, even when empty) - const $firstPaneHolder = $("#first-pane .pane-content"); - const $secondPaneHolder = $("#second-pane .pane-content"); - - // handle the drop events on empty panes - setupEmptyPaneDropTarget($firstPaneHolder, "first-pane"); - setupEmptyPaneDropTarget($secondPaneHolder, "second-pane"); + function handleDragEnd(event) { + // Small delay to ensure other events finish + setTimeout(() => { + cleanupDragState(); + }, 50); } /** - * sets up the whole pane as a drop target when it has no tabs - * - * @param {jQuery} $paneHolder - The jQuery object for the pane content area - * @param {String} paneId - The ID of the pane ("first-pane" or "second-pane") + * this function handles drag leave + * @param {Event} event - the event instance */ - function setupEmptyPaneDropTarget($paneHolder, paneId) { - // remove if any existing handlers to prevent duplicates - $paneHolder.off("dragover dragenter dragleave drop"); + function handleDragLeave(event) { + // Only remove styling if truly leaving the element + const relatedTarget = event.originalEvent.relatedTarget; + if (!$(this).is(relatedTarget) && !$(this).has(relatedTarget).length) { + $(this).removeClass("drag-target"); + } + } - // Handle drag over empty pane - $paneHolder.on("dragover dragenter", function (e) { - if (draggedTab) { - e.preventDefault(); - e.stopPropagation(); + /** + * Setup drag handlers for a tab bar + * @param {string} tabBarSelector - The jQuery selector for the tab bar + */ + function setupTabBarDragHandlers(tabBarSelector) { + const $tabBar = $(tabBarSelector); - // add visual indicator that this is a drop target [refer to Extn-TabBar.less] - $(this).addClass("empty-pane-drop-target"); + // Remove existing handlers to prevent duplicates + $tabBar.off("dragstart dragover dragenter dragleave drop dragend"); - // set the drop effect - if (e.originalEvent && e.originalEvent.dataTransfer) { - e.originalEvent.dataTransfer.dropEffect = "move"; - } - } - }); + // add the handlers + $tabBar.on("dragstart", ".tab", handleDragStart); + $tabBar.on("dragover", ".tab", handleDragOver); + $tabBar.on("dragleave", ".tab", handleDragLeave); + $tabBar.on("drop", ".tab", handleDrop); + $tabBar.on("dragend", ".tab", handleDragEnd); - // handle leaving an empty pane drop target - $paneHolder.on("dragleave", function (e) { - $(this).removeClass("empty-pane-drop-target"); - }); + // container level handlers (for empty space) + $tabBar.on("dragover", handleContainerDragOver); + $tabBar.on("drop", handleContainerDrop); - // Handle drop on empty pane - $paneHolder.on("drop", function (e) { - const $tabBar = paneId === "first-pane" ? $("#phoenix-tab-bar") : $("#phoenix-tab-bar-2"); - const isEmptyPane = !$tabBar.length || $tabBar.is(":hidden") || $tabBar.children(".tab").length === 0; + // Make tabs draggable + $tabBar.find(".tab").attr("draggable", true); + } - if (draggedTab) { - e.preventDefault(); - e.stopPropagation(); + /** + * setup the pane drop targets + */ + function setupPaneDropTargets() { + const panes = ["#first-pane .pane-content", "#second-pane .pane-content"]; + + panes.forEach((paneSelector, index) => { + const paneId = index === 0 ? "first-pane" : "second-pane"; + const $pane = $(paneSelector); + + $pane.off("dragover dragenter dragleave drop"); - // remove the highlight - $(this).removeClass("empty-pane-drop-target"); + $pane.on("dragover dragenter", function (event) { + if (draggedTab && dragSourcePane !== paneId) { + // Only allow cross-pane drops + event.preventDefault(); - // get the dragged file path - const draggedPath = $(draggedTab).attr("data-path"); + // Check if this pane is empty for visual styling + const tabBarId = paneId === "first-pane" ? "#phoenix-tab-bar" : "#phoenix-tab-bar-2"; + const $tabBar = $(tabBarId); + const isEmptyPane = + !$tabBar.length || $tabBar.is(":hidden") || $tabBar.children(".tab").length === 0; - // Determine source pane - const sourcePaneId = - $(draggedTab).closest("#phoenix-tab-bar-2").length > 0 ? "second-pane" : "first-pane"; + if (isEmptyPane) { + $(this).addClass("empty-pane-drop-target"); + } else { + // Add a different class for non-empty panes + $(this).addClass("pane-drop-target"); + } + } + }); + + $pane.on("dragleave", function (event) { + $(this).removeClass("empty-pane-drop-target pane-drop-target"); + }); - // we only want to proceed if we're not dropping in the same pane or, - // allow if it's the same pane with existing tabs - if (sourcePaneId !== paneId || !isEmptyPane) { - const sourceWorkingSet = MainViewManager.getWorkingSet(sourcePaneId); + $pane.on("drop", function (event) { + if (draggedTab && dragSourcePane !== paneId) { + event.preventDefault(); + $(this).removeClass("empty-pane-drop-target pane-drop-target"); + + const draggedPath = $(draggedTab).attr("data-path"); + const sourceWorkingSet = MainViewManager.getWorkingSet(dragSourcePane); const targetWorkingSet = MainViewManager.getWorkingSet(paneId); let draggedFile = null; - // Find the dragged file in the source pane - for (let i = 0; i < sourceWorkingSet.length; i++) { - if (sourceWorkingSet[i].fullPath === draggedPath) { - draggedFile = sourceWorkingSet[i]; + // Find dragged file + for (let file of sourceWorkingSet) { + if (file.fullPath === draggedPath) { + draggedFile = file; break; } } if (draggedFile) { - if (sourcePaneId !== paneId) { - // Check if the dragged file is currently active in the source pane - const currentActiveFileInSource = MainViewManager.getCurrentlyViewedFile(sourcePaneId); - const isActiveFileBeingMoved = currentActiveFileInSource && - currentActiveFileInSource.fullPath === draggedPath; - - // If the active file is being moved and there are other files in the source pane, - // switch to another file first to prevent placeholder creation - if (isActiveFileBeingMoved && sourceWorkingSet.length > 1) { - // Find another file to make active - let draggedIndex = -1; - for (let i = 0; i < sourceWorkingSet.length; i++) { - if (sourceWorkingSet[i].fullPath === draggedPath) { - draggedIndex = i; - break; - } - } - - if (draggedIndex !== -1) { - let newActiveIndex = draggedIndex + 1; - if (newActiveIndex >= sourceWorkingSet.length) { - newActiveIndex = draggedIndex - 1; - } - - if (newActiveIndex >= 0 && newActiveIndex < sourceWorkingSet.length) { - const newActiveFile = sourceWorkingSet[newActiveIndex]; - // Open the new active file in the source pane before removing the dragged file - CommandManager.execute(Commands.FILE_OPEN, { - fullPath: newActiveFile.fullPath, - paneId: sourcePaneId - }); - } - } - } + // Close in source pane + CommandManager.execute(Commands.FILE_CLOSE, { file: draggedFile, paneId: dragSourcePane }); - // If different panes, close in source pane - CommandManager.execute(Commands.FILE_CLOSE, { file: draggedFile, paneId: sourcePaneId }); - - // For non-empty panes, find current active file to place tab after it - if (!isEmptyPane && targetWorkingSet.length > 0) { - const currentActiveFile = MainViewManager.getCurrentlyViewedFile(paneId); - - if (currentActiveFile) { - // Find index of current active file - let targetIndex = -1; - for (let i = 0; i < targetWorkingSet.length; i++) { - if (targetWorkingSet[i].fullPath === currentActiveFile.fullPath) { - targetIndex = i; - break; - } - } + // Check if target pane is empty or has files + const tabBarId = paneId === "first-pane" ? "#phoenix-tab-bar" : "#phoenix-tab-bar-2"; + const $tabBar = $(tabBarId); + const isEmptyPane = + !$tabBar.length || $tabBar.is(":hidden") || $tabBar.children(".tab").length === 0; - if (targetIndex !== -1) { - // Add after current active file - MainViewManager.addToWorkingSet(paneId, draggedFile, targetIndex + 1); - } else { - // Fallback to adding at the end - MainViewManager.addToWorkingSet(paneId, draggedFile); + if (isEmptyPane) { + // Empty pane: just add the file + MainViewManager.addToWorkingSet(paneId, draggedFile); + } else { + // Non-empty pane: add after the currently active file + const currentActiveFile = MainViewManager.getCurrentlyViewedFile(paneId); + if (currentActiveFile) { + // Find index of current active file and insert after it + let targetIndex = -1; + for (let i = 0; i < targetWorkingSet.length; i++) { + if (targetWorkingSet[i].fullPath === currentActiveFile.fullPath) { + targetIndex = i; + break; } - } else { - // No active file, add to the end - MainViewManager.addToWorkingSet(paneId, draggedFile); } + MainViewManager.addToWorkingSet(paneId, draggedFile, targetIndex + 1); } else { - // Empty pane, just add it + // Fallback: add to end MainViewManager.addToWorkingSet(paneId, draggedFile); } - - // Open file in target pane - CommandManager.execute(Commands.FILE_OPEN, { fullPath: draggedPath, paneId: paneId }); - } else if (isEmptyPane) { - // Same pane, empty pane case (should never happen but kept for safety) - MainViewManager.addToWorkingSet(paneId, draggedFile); - CommandManager.execute(Commands.FILE_OPEN, { fullPath: draggedPath, paneId: paneId }); } + + // Open file in target pane + CommandManager.execute(Commands.FILE_OPEN, { fullPath: draggedPath, paneId: paneId }); } + + cleanupDragState(); } + }); + }); + } + + /** + * clean up the handlers + */ + function setupGlobalCleanup() { + // Clean up on document level events + $(document).on("dragend mouseup", function () { + if (draggedTab) { + setTimeout(() => cleanupDragState(), 100); + } + }); + // Clean up on escape key + $(document).on("keydown", function (event) { + if (event.key === "Escape" && draggedTab) { cleanupDragState(); } }); } + /** + * Initialize drag and drop functionality + * @param {string} firstPaneSelector - The selector for the first pane tab bar + * @param {string} secondPaneSelector - The selector for the second pane tab bar + */ + function init(firstPaneSelector, secondPaneSelector) { + // setup drag handlers for both tab bars + if (firstPaneSelector) { + setupTabBarDragHandlers(firstPaneSelector); + } + if (secondPaneSelector) { + setupTabBarDragHandlers(secondPaneSelector); + } + + setupPaneDropTargets(); + setupGlobalCleanup(); + ensureDragIndicator(); + } + module.exports = { init }; From b26d24345283ba12e685eb7fc83adaf747f2bc48 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 15:46:36 +0530 Subject: [PATCH 196/849] fix: typo in comment --- src/extensionsIntegrated/TabBar/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 2e571fb5d7..264c890ade 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -511,7 +511,7 @@ define(function (require, exports, module) { // delegate event handling for both tab bars $(document).on("mousedown", ".phoenix-tab-bar .tab", function (event) { - // to prevent right clicks activate the mousedown event + // to prevent right-clicks from activating the mousedown event if (event.button === 2) { return; } if ($(event.target).hasClass("fa-times") || $(event.target).closest(".tab-close").length) { From 8de275f67cd20969491d77f2e6fd1e932fc512c3 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 19:33:42 +0530 Subject: [PATCH 197/849] fix: clicking twice on overflow button doesn't hide the dropdown --- src/extensionsIntegrated/TabBar/overflow.js | 73 +++++++++++++-------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/overflow.js b/src/extensionsIntegrated/TabBar/overflow.js index 169e6e63fd..77f1e04c76 100644 --- a/src/extensionsIntegrated/TabBar/overflow.js +++ b/src/extensionsIntegrated/TabBar/overflow.js @@ -35,6 +35,8 @@ define(function (require, exports, module) { const EditorManager = require("editor/EditorManager"); const FileSystem = require("filesystem/FileSystem"); + // holds the dropdown instance + let $dropdown = null; /** * This function determines which tabs are hidden in the tab bar due to overflow @@ -130,15 +132,12 @@ define(function (require, exports, module) { function showOverflowMenu(paneId, x, y) { const hiddenTabs = _getListOfHiddenTabs(paneId); - // first, remove any existing dropdown menus to prevent duplicates - $(".dropdown-overflow-menu").remove(); - // Create a map to track tabs that are being closed // Using paths as keys for quick lookup const closingTabPaths = {}; // create the dropdown - const dropdown = new DropdownButton.DropdownButton("", hiddenTabs, function (item, index) { + $dropdown = new DropdownButton.DropdownButton("", hiddenTabs, function (item, index) { const iconHtml = item.$icon[0].outerHTML; // the file icon const dirtyHtml = item.isDirty ? '•' @@ -169,15 +168,14 @@ define(function (require, exports, module) { }; }); - // add the custom classes for styling the dropdown - dropdown.dropdownExtraClasses = "dropdown-overflow-menu"; - dropdown.$button.addClass("btn-overflow-tabs"); + // add custom class to separate overflow dropdown from regular ones + $dropdown.dropdownExtraClasses = "dropdown-overflow-menu"; // appending to document body. we'll position this with absolute positioning - $("body").append(dropdown.$button); + $("body").append($dropdown.$button); // position the dropdown where the user clicked - dropdown.$button.css({ + $dropdown.$button.css({ position: "absolute", left: x + "px", top: y + "px", @@ -203,10 +201,10 @@ define(function (require, exports, module) { e.preventDefault(); }); - dropdown.showDropdown(); + $dropdown.showDropdown(); // handle the option selection - dropdown.on("select", function (e, item, index) { + $dropdown.on("select", function (e, item, index) { // check if this tab was marked for closing if (closingTabPaths[item.path]) { // this tab is being closed, so handle the close operation @@ -240,15 +238,9 @@ define(function (require, exports, module) { } }); - // clean up when the dropdown is closed - dropdown.$button.on("dropdown-closed", function () { - $(document).off("mousedown", ".tab-close-icon-overflow"); - dropdown.$button.remove(); - }); - // a button was getting displayed on the screen wherever a click was made. not sure why // but this fixes it - dropdown.$button.css({ + $dropdown.$button.css({ display: "none" }); } @@ -335,29 +327,52 @@ define(function (require, exports, module) { } } + /** + * to close the overflow button's dropdown + */ + function _closeDropdown() { + if ($dropdown) { + if ($dropdown.$button) { + $dropdown.$button.remove(); + } + $dropdown = null; + } + } + + /** + * this function gets called when the overflow button gets clicked + * it shows/closes the dropdown as required + * @param {Event} e - the event instance + * @param {String} paneId - the pane id "first-pane" or "second-pane" + */ + function _handleOverflowButtonClick(e, paneId) { + e.stopPropagation(); + $dropdown ? _closeDropdown() : showOverflowMenu(paneId, e.pageX, e.pageY); + } /** - * To setup the handlers for the overflow menu + * initialize the handling of the overflow buttons + * this also registers the event handlers */ - function setupOverflowHandlers() { + function init() { + // when clicked anywhere on the page we want to close the dropdown + // except the overflow-buttons + $("html").on("click", function (e) { + if ($(e.target).closest("#overflow-button, #overflow-button-2").length) { return; } + _closeDropdown(); + }); + // handle when the overflow button is clicked for the first pane $(document).on("click", "#overflow-button", function (e) { - e.stopPropagation(); - showOverflowMenu("first-pane", e.pageX, e.pageY); + _handleOverflowButtonClick(e, "first-pane"); }); // for second pane $(document).on("click", "#overflow-button-2", function (e) { - e.stopPropagation(); - showOverflowMenu("second-pane", e.pageX, e.pageY); + _handleOverflowButtonClick(e, "second-pane"); }); } - // initialize the handling of the overflow buttons - function init() { - setupOverflowHandlers(); - } - module.exports = { init, toggleOverflowVisibility, From b7a0754b71e3ce0cf4bb93e1870d582317f9cf8a Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 20:16:00 +0530 Subject: [PATCH 198/849] fix: mousedown event not getting trigged when dropdown exists, moved everything to click handler --- src/extensionsIntegrated/TabBar/main.js | 56 +++++++------------------ 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 264c890ade..8bea1d4fdf 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -487,60 +487,36 @@ define(function (require, exports, module) { function handleTabClick() { // delegate event handling for both tab bars $(document).on("click", ".phoenix-tab-bar .tab", function (event) { - // check if the clicked element is the close button - if ($(event.target).hasClass("fa-times") || $(event.target).closest(".tab-close").length) { - // Get the file path from the data-path attribute of the parent tab - const filePath = $(this).attr("data-path"); - - if (filePath) { - // determine the pane inside which the tab belongs - const isSecondPane = $(this).closest("#phoenix-tab-bar-2").length > 0; - const paneId = isSecondPane ? "second-pane" : "first-pane"; - - // get the file object - const fileObj = FileSystem.getFileForPath(filePath); - // close the file - CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); + // Get the file path from the data-path attribute of the parent tab + const filePath = $(this).attr("data-path"); + if (!filePath) { return; } - // Prevent default behavior - event.preventDefault(); - event.stopPropagation(); - } - } - }); + // determine the pane inside which the tab belongs + const isSecondPane = $(this).closest("#phoenix-tab-bar-2").length > 0; + const paneId = isSecondPane ? "second-pane" : "first-pane"; - // delegate event handling for both tab bars - $(document).on("mousedown", ".phoenix-tab-bar .tab", function (event) { - // to prevent right-clicks from activating the mousedown event - if (event.button === 2) { return; } + // get the file object + const fileObj = FileSystem.getFileForPath(filePath); + // check if the clicked element is the close button if ($(event.target).hasClass("fa-times") || $(event.target).closest(".tab-close").length) { - return; - } - // Get the file path from the data-path attribute - const filePath = $(this).attr("data-path"); + event.preventDefault(); + event.stopPropagation(); - if (filePath) { - // determine the pane inside which the tab belongs - const isSecondPane = $(this).closest("#phoenix-tab-bar-2").length > 0; - const paneId = isSecondPane ? "second-pane" : "first-pane"; + CommandManager.execute(Commands.FILE_CLOSE, { file: fileObj, paneId: paneId }); // close the file + } else { // open the clicked tab const currentActivePane = MainViewManager.getActivePaneId(); const isPaneActive = paneId === currentActivePane; const currentFile = MainViewManager.getCurrentlyViewedFile(currentActivePane); - // Check if this is a placeholder tab + // if the clicked tab is a placeholder tab, we add it to the working set if ($(this).hasClass("placeholder")) { - // Add the file to the working set when placeholder tab is clicked - const fileObj = FileSystem.getFileForPath(filePath); MainViewManager.addToWorkingSet(paneId, fileObj); } - if (isPaneActive && currentFile && currentFile.fullPath === filePath) { - return; - } + // clicked tab is already active, don't do anything + if (isPaneActive && currentFile && currentFile.fullPath === filePath) { return; } CommandManager.execute(Commands.FILE_OPEN, { fullPath: filePath, paneId: paneId }); - - // We dont prevent default behavior here to enable drag and drop of this tab } }); From bc8c938a9dedafba16016787af7b44b0104b5650 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 20:22:11 +0530 Subject: [PATCH 199/849] fix: tests failing as changed tab open handler from mousedown to click --- test/spec/Extn-Tabbar-integ-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec/Extn-Tabbar-integ-test.js b/test/spec/Extn-Tabbar-integ-test.js index 9292bce749..bd5840875d 100644 --- a/test/spec/Extn-Tabbar-integ-test.js +++ b/test/spec/Extn-Tabbar-integ-test.js @@ -1193,7 +1193,7 @@ define(function (require, exports, module) { async function clickTabAndVerify(filePath, description) { const $tab = getTab(filePath); expect($tab.length).toBe(1); - $tab.trigger("mousedown"); + $tab.trigger("click"); // Wait for the file to become active await awaitsFor( From de940b3cee24e010b78d4dfe6abc9fb91cd4b775 Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 21:17:04 +0530 Subject: [PATCH 200/849] fix: add localization for overflow button tooltips --- src/extensionsIntegrated/TabBar/html/tabbar-pane.html | 2 +- src/extensionsIntegrated/TabBar/html/tabbar-second-pane.html | 2 +- src/extensionsIntegrated/TabBar/main.js | 3 +++ src/nls/root/strings.js | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/extensionsIntegrated/TabBar/html/tabbar-pane.html b/src/extensionsIntegrated/TabBar/html/tabbar-pane.html index c48160c2f7..2f9a0e0a74 100644 --- a/src/extensionsIntegrated/TabBar/html/tabbar-pane.html +++ b/src/extensionsIntegrated/TabBar/html/tabbar-pane.html @@ -3,7 +3,7 @@
-
+
diff --git a/src/extensionsIntegrated/TabBar/html/tabbar-second-pane.html b/src/extensionsIntegrated/TabBar/html/tabbar-second-pane.html index a0a8ab597d..795598e47e 100644 --- a/src/extensionsIntegrated/TabBar/html/tabbar-second-pane.html +++ b/src/extensionsIntegrated/TabBar/html/tabbar-second-pane.html @@ -3,7 +3,7 @@
-
+
diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 8bea1d4fdf..241baf5eeb 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -229,6 +229,7 @@ define(function (require, exports, module) { $tabBar = $(TabBarHTML); // since we need to add the tab bar before the editor which has .not-editor class $(".pane-header").after($tabBar); + $("#overflow-button").attr("title", Strings.TABBAR_SHOW_HIDDEN_TABS); WorkspaceManager.recomputeLayout(true); updateTabs(); } else if ($paneHeader.length === 2) { @@ -239,6 +240,8 @@ define(function (require, exports, module) { // TODO: Fix bug where the tab bar gets hidden inside the editor in horizontal split $paneHeader.eq(0).after($tabBar); $paneHeader.eq(1).after($tabBar2); + $("#overflow-button").attr("title", Strings.TABBAR_SHOW_HIDDEN_TABS); + $("#overflow-button-2").attr("title", Strings.TABBAR_SHOW_HIDDEN_TABS); WorkspaceManager.recomputeLayout(true); updateTabs(); } diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index abb3b0e46c..23b764535c 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1309,6 +1309,7 @@ define({ "DESCRIPTION_TABBAR": "Set the tab bar settings.", "DESCRIPTION_SHOW_TABBAR": "true to show the tab bar, else false.", "DESCRIPTION_NUMBER_OF_TABS": "The number of tabs to show in the tab bar. Set to -1 to show all tabs", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", // Git extension "ENABLE_GIT": "Enable Git", From adcd70afb36a17c7a0a3fcff988878f1ab35015e Mon Sep 17 00:00:00 2001 From: Pluto Date: Thu, 4 Sep 2025 21:32:56 +0530 Subject: [PATCH 201/849] fix: tab clicks when switching panes not marking correct tab as active --- src/extensionsIntegrated/TabBar/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js index 241baf5eeb..c4d9971380 100644 --- a/src/extensionsIntegrated/TabBar/main.js +++ b/src/extensionsIntegrated/TabBar/main.js @@ -595,7 +595,7 @@ define(function (require, exports, module) { MainViewManager.on("paneCreate paneDestroy paneLayoutChange", createTabBar); // For active pane changes, update only the tabs - MainViewManager.on("activePaneChange", updateTabs); + MainViewManager.on("activePaneChange", debounceUpdateTabs); // For editor changes, update only the tabs. MainViewManager.on(MainViewManager.EVENT_CURRENT_FILE_CHANGE, debounceUpdateTabs); From 11c782e1f5a7bdc92e55eb6e87670d1121d1e312 Mon Sep 17 00:00:00 2001 From: abose Date: Sat, 6 Sep 2025 09:41:11 +0000 Subject: [PATCH 202/849] ci: update Translations --- src/nls/ar/lastTranslated.json | 1 + src/nls/ar/strings.js | 3 ++- src/nls/bg/lastTranslated.json | 1 + src/nls/bg/strings.js | 3 ++- src/nls/cs/lastTranslated.json | 1 + src/nls/cs/strings.js | 3 ++- src/nls/da/lastTranslated.json | 1 + src/nls/da/strings.js | 3 ++- src/nls/de/lastTranslated.json | 1 + src/nls/de/strings.js | 3 ++- src/nls/el/lastTranslated.json | 1 + src/nls/el/strings.js | 3 ++- src/nls/en-gb/lastTranslated.json | 1 + src/nls/en-gb/strings.js | 3 ++- src/nls/es/lastTranslated.json | 1 + src/nls/es/strings.js | 3 ++- src/nls/fa-ir/lastTranslated.json | 1 + src/nls/fa-ir/strings.js | 3 ++- src/nls/fi/lastTranslated.json | 1 + src/nls/fi/strings.js | 3 ++- src/nls/fr/lastTranslated.json | 1 + src/nls/fr/strings.js | 3 ++- src/nls/gl/lastTranslated.json | 1 + src/nls/gl/strings.js | 3 ++- src/nls/hi/lastTranslated.json | 1 + src/nls/hi/strings.js | 3 ++- src/nls/hr/lastTranslated.json | 1 + src/nls/hr/strings.js | 3 ++- src/nls/hu/lastTranslated.json | 1 + src/nls/hu/strings.js | 3 ++- src/nls/id/lastTranslated.json | 1 + src/nls/id/strings.js | 3 ++- src/nls/it/lastTranslated.json | 1 + src/nls/it/strings.js | 3 ++- src/nls/ja/lastTranslated.json | 1 + src/nls/ja/strings.js | 3 ++- src/nls/ko/lastTranslated.json | 1 + src/nls/ko/strings.js | 3 ++- src/nls/lv/lastTranslated.json | 1 + src/nls/lv/strings.js | 3 ++- src/nls/ml/lastTranslated.json | 1 + src/nls/ml/strings.js | 3 ++- src/nls/nb/lastTranslated.json | 1 + src/nls/nb/strings.js | 3 ++- src/nls/nl/lastTranslated.json | 1 + src/nls/nl/strings.js | 3 ++- src/nls/pl/lastTranslated.json | 1 + src/nls/pl/strings.js | 3 ++- src/nls/pt-br/lastTranslated.json | 1 + src/nls/pt-br/strings.js | 3 ++- src/nls/pt-pt/lastTranslated.json | 1 + src/nls/pt-pt/strings.js | 3 ++- src/nls/ro/lastTranslated.json | 1 + src/nls/ro/strings.js | 3 ++- src/nls/ru/lastTranslated.json | 1 + src/nls/ru/strings.js | 3 ++- src/nls/sk/lastTranslated.json | 1 + src/nls/sk/strings.js | 3 ++- src/nls/sr/lastTranslated.json | 1 + src/nls/sr/strings.js | 3 ++- src/nls/sv/lastTranslated.json | 1 + src/nls/sv/strings.js | 3 ++- src/nls/tr/lastTranslated.json | 1 + src/nls/tr/strings.js | 3 ++- src/nls/uk/lastTranslated.json | 1 + src/nls/uk/strings.js | 3 ++- src/nls/ur/lastTranslated.json | 1 + src/nls/ur/strings.js | 3 ++- src/nls/zh-cn/lastTranslated.json | 1 + src/nls/zh-cn/strings.js | 3 ++- src/nls/zh-tw/lastTranslated.json | 1 + src/nls/zh-tw/strings.js | 3 ++- 72 files changed, 108 insertions(+), 36 deletions(-) diff --git a/src/nls/ar/lastTranslated.json b/src/nls/ar/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/ar/lastTranslated.json +++ b/src/nls/ar/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/ar/strings.js b/src/nls/ar/strings.js index 44d4ee38c4..1c25533540 100644 --- a/src/nls/ar/strings.js +++ b/src/nls/ar/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "اختصار", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "نص القالب", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "الوصف", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "امتداد الملف" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "امتداد الملف", + "TABBAR_SHOW_HIDDEN_TABS": "إظهار علامات التبويب المخفية" }); \ No newline at end of file diff --git a/src/nls/bg/lastTranslated.json b/src/nls/bg/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/bg/lastTranslated.json +++ b/src/nls/bg/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/bg/strings.js b/src/nls/bg/strings.js index 24e344ebe1..b5f0f11a9b 100644 --- a/src/nls/bg/strings.js +++ b/src/nls/bg/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Съкращение", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст на шаблон", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Описание", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Разширение на файл" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Разширение на файл", + "TABBAR_SHOW_HIDDEN_TABS": "Показване на скритите раздели" }); \ No newline at end of file diff --git a/src/nls/cs/lastTranslated.json b/src/nls/cs/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/cs/lastTranslated.json +++ b/src/nls/cs/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js index 91e83d01cd..f2752d94b0 100644 --- a/src/nls/cs/strings.js +++ b/src/nls/cs/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Zkratka", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text šablony", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Popis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Přípona souboru" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Přípona souboru", + "TABBAR_SHOW_HIDDEN_TABS": "Zobrazit skryté karty" }); \ No newline at end of file diff --git a/src/nls/da/lastTranslated.json b/src/nls/da/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/da/lastTranslated.json +++ b/src/nls/da/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/da/strings.js b/src/nls/da/strings.js index 19cc63f91c..4410095fcc 100644 --- a/src/nls/da/strings.js +++ b/src/nls/da/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Forkortelse", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Skabelontekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivelse", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtypenavn" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtypenavn", + "TABBAR_SHOW_HIDDEN_TABS": "Vis skjulte faner" }); \ No newline at end of file diff --git a/src/nls/de/lastTranslated.json b/src/nls/de/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/de/lastTranslated.json +++ b/src/nls/de/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js index 00518eb337..fc5b1413c3 100644 --- a/src/nls/de/strings.js +++ b/src/nls/de/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Kürzel", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Vorlagentext", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beschreibung", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dateierweiterung" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dateierweiterung", + "TABBAR_SHOW_HIDDEN_TABS": "Versteckte Tabs anzeigen" }); \ No newline at end of file diff --git a/src/nls/el/lastTranslated.json b/src/nls/el/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/el/lastTranslated.json +++ b/src/nls/el/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/el/strings.js b/src/nls/el/strings.js index 85258c7632..d5c24e6d87 100644 --- a/src/nls/el/strings.js +++ b/src/nls/el/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Συντομογραφία", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Κείμενο Προτύπου", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Περιγραφή", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Επέκταση Αρχείου" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Επέκταση Αρχείου", + "TABBAR_SHOW_HIDDEN_TABS": "Εμφάνιση κρυφών καρτελών" }); \ No newline at end of file diff --git a/src/nls/en-gb/lastTranslated.json b/src/nls/en-gb/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/en-gb/lastTranslated.json +++ b/src/nls/en-gb/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/en-gb/strings.js b/src/nls/en-gb/strings.js index f2ff730950..198c0980be 100644 --- a/src/nls/en-gb/strings.js +++ b/src/nls/en-gb/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abbreviation", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Template Text", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "File Extension" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "File Extension", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs" }); \ No newline at end of file diff --git a/src/nls/es/lastTranslated.json b/src/nls/es/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/es/lastTranslated.json +++ b/src/nls/es/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/es/strings.js b/src/nls/es/strings.js index fe703117dc..3dd1b851a3 100644 --- a/src/nls/es/strings.js +++ b/src/nls/es/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviatura", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto de la plantilla", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descripción", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de archivo" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de archivo", + "TABBAR_SHOW_HIDDEN_TABS": "Mostrar pestañas ocultas" }); \ No newline at end of file diff --git a/src/nls/fa-ir/lastTranslated.json b/src/nls/fa-ir/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/fa-ir/lastTranslated.json +++ b/src/nls/fa-ir/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js index 60ae78efde..3366561992 100644 --- a/src/nls/fa-ir/strings.js +++ b/src/nls/fa-ir/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "مخفف", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "متن الگو", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "توضیحات", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "پسوند فایل" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "پسوند فایل", + "TABBAR_SHOW_HIDDEN_TABS": "نمایش برگه‌های پنهان" }); \ No newline at end of file diff --git a/src/nls/fi/lastTranslated.json b/src/nls/fi/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/fi/lastTranslated.json +++ b/src/nls/fi/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js index bcb623ee07..2ed2a10f4f 100644 --- a/src/nls/fi/strings.js +++ b/src/nls/fi/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Lyhenne", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Malliteksti", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Kuvaus", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Tiedostopääte" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Tiedostopääte", + "TABBAR_SHOW_HIDDEN_TABS": "Näytä piilotetut välilehdet" }); \ No newline at end of file diff --git a/src/nls/fr/lastTranslated.json b/src/nls/fr/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/fr/lastTranslated.json +++ b/src/nls/fr/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js index 167ef07968..1aad20852b 100644 --- a/src/nls/fr/strings.js +++ b/src/nls/fr/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abréviation", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texte du modèle", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extension de fichier" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extension de fichier", + "TABBAR_SHOW_HIDDEN_TABS": "Afficher les onglets masqués" }); \ No newline at end of file diff --git a/src/nls/gl/lastTranslated.json b/src/nls/gl/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/gl/lastTranslated.json +++ b/src/nls/gl/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/gl/strings.js b/src/nls/gl/strings.js index e9d6e78956..7a9d65accd 100644 --- a/src/nls/gl/strings.js +++ b/src/nls/gl/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviatura", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrición", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de ficheiro" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensión de ficheiro", + "TABBAR_SHOW_HIDDEN_TABS": "Mostrar pestanas ocultas" }); \ No newline at end of file diff --git a/src/nls/hi/lastTranslated.json b/src/nls/hi/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/hi/lastTranslated.json +++ b/src/nls/hi/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/hi/strings.js b/src/nls/hi/strings.js index ccbc89c665..6d9098a258 100644 --- a/src/nls/hi/strings.js +++ b/src/nls/hi/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "संक्षिप्त नाम", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "टेम्पलेट टेक्स्ट", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "विवरण", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "फ़ाइल एक्सटेंशन" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "फ़ाइल एक्सटेंशन", + "TABBAR_SHOW_HIDDEN_TABS": "छिपे हुए टैब दिखाएँ" }); \ No newline at end of file diff --git a/src/nls/hr/lastTranslated.json b/src/nls/hr/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/hr/lastTranslated.json +++ b/src/nls/hr/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/hr/strings.js b/src/nls/hr/strings.js index f4077d8124..77c26a6cee 100644 --- a/src/nls/hr/strings.js +++ b/src/nls/hr/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Kratica", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Tekst predloška", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Opis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstenzija datoteke" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstenzija datoteke", + "TABBAR_SHOW_HIDDEN_TABS": "Prikaži skrivene kartice" }); \ No newline at end of file diff --git a/src/nls/hu/lastTranslated.json b/src/nls/hu/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/hu/lastTranslated.json +++ b/src/nls/hu/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/hu/strings.js b/src/nls/hu/strings.js index 045231ef9b..290447609a 100644 --- a/src/nls/hu/strings.js +++ b/src/nls/hu/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Rövidítés", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Sablonszöveg", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Leírás", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Fájlkiterjesztés" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Fájlkiterjesztés", + "TABBAR_SHOW_HIDDEN_TABS": "Rejtett fülek megjelenítése" }); \ No newline at end of file diff --git a/src/nls/id/lastTranslated.json b/src/nls/id/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/id/lastTranslated.json +++ b/src/nls/id/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/id/strings.js b/src/nls/id/strings.js index bb24a05806..78802d85a5 100644 --- a/src/nls/id/strings.js +++ b/src/nls/id/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Singkatan", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Teks Templat", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Deskripsi", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstensi Berkas" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Ekstensi Berkas", + "TABBAR_SHOW_HIDDEN_TABS": "Tampilkan tab tersembunyi" }); \ No newline at end of file diff --git a/src/nls/it/lastTranslated.json b/src/nls/it/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/it/lastTranslated.json +++ b/src/nls/it/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js index 00d1f70cf6..466217620d 100644 --- a/src/nls/it/strings.js +++ b/src/nls/it/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abbreviazione", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Testo del Modello", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrizione", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Estensione del File" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Estensione del File", + "TABBAR_SHOW_HIDDEN_TABS": "Mostra le schede nascoste" }); \ No newline at end of file diff --git a/src/nls/ja/lastTranslated.json b/src/nls/ja/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/ja/lastTranslated.json +++ b/src/nls/ja/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js index 0cb6d3eaf1..25eb8e5567 100644 --- a/src/nls/ja/strings.js +++ b/src/nls/ja/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "略語", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "テンプレートテキスト", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "説明", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ファイル拡張子" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ファイル拡張子", + "TABBAR_SHOW_HIDDEN_TABS": "非表示のタブを表示" }); \ No newline at end of file diff --git a/src/nls/ko/lastTranslated.json b/src/nls/ko/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/ko/lastTranslated.json +++ b/src/nls/ko/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/ko/strings.js b/src/nls/ko/strings.js index ee4d2edaf0..a64a8ba07d 100644 --- a/src/nls/ko/strings.js +++ b/src/nls/ko/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "약어", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "템플릿 텍스트", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "설명", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "파일 확장자" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "파일 확장자", + "TABBAR_SHOW_HIDDEN_TABS": "숨겨진 탭 표시" }); \ No newline at end of file diff --git a/src/nls/lv/lastTranslated.json b/src/nls/lv/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/lv/lastTranslated.json +++ b/src/nls/lv/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/lv/strings.js b/src/nls/lv/strings.js index b55cc43ff2..f7bb401a18 100644 --- a/src/nls/lv/strings.js +++ b/src/nls/lv/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Saīsinājums", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Veidnes teksts", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Apraksts", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Faila paplašinājums" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Faila paplašinājums", + "TABBAR_SHOW_HIDDEN_TABS": "Rādīt paslēptās cilnes" }); \ No newline at end of file diff --git a/src/nls/ml/lastTranslated.json b/src/nls/ml/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/ml/lastTranslated.json +++ b/src/nls/ml/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/ml/strings.js b/src/nls/ml/strings.js index 480b62ef76..130b446337 100644 --- a/src/nls/ml/strings.js +++ b/src/nls/ml/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "ചുരുക്കെഴുത്ത്", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "ടെംപ്ലേറ്റ് ടെക്സ്റ്റ്", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "വിവരണം", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ഫയൽ എക്സ്റ്റൻഷൻ" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "ഫയൽ എക്സ്റ്റൻഷൻ", + "TABBAR_SHOW_HIDDEN_TABS": "മറഞ്ഞിരിക്കുന്ന ടാബുകൾ കാണിക്കുക" }); \ No newline at end of file diff --git a/src/nls/nb/lastTranslated.json b/src/nls/nb/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/nb/lastTranslated.json +++ b/src/nls/nb/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/nb/strings.js b/src/nls/nb/strings.js index a759eeea80..1e865a8208 100644 --- a/src/nls/nb/strings.js +++ b/src/nls/nb/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Forkortelse", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Maltekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivelse", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtype" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filtype", + "TABBAR_SHOW_HIDDEN_TABS": "Vis skjulte faner" }); \ No newline at end of file diff --git a/src/nls/nl/lastTranslated.json b/src/nls/nl/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/nl/lastTranslated.json +++ b/src/nls/nl/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js index 1f5a4cf2d8..8fd33375e7 100644 --- a/src/nls/nl/strings.js +++ b/src/nls/nl/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Afkorting", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Sjabloontekst", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beschrijving", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Bestandsextensie" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Bestandsextensie", + "TABBAR_SHOW_HIDDEN_TABS": "Verborgen tabbladen tonen" }); \ No newline at end of file diff --git a/src/nls/pl/lastTranslated.json b/src/nls/pl/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/pl/lastTranslated.json +++ b/src/nls/pl/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/pl/strings.js b/src/nls/pl/strings.js index 22ac1be562..7dcf045c39 100644 --- a/src/nls/pl/strings.js +++ b/src/nls/pl/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Skrót", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Treść szablonu", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Opis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Rozszerzenie pliku" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Rozszerzenie pliku", + "TABBAR_SHOW_HIDDEN_TABS": "Pokaż ukryte karty" }); \ No newline at end of file diff --git a/src/nls/pt-br/lastTranslated.json b/src/nls/pt-br/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/pt-br/lastTranslated.json +++ b/src/nls/pt-br/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/pt-br/strings.js b/src/nls/pt-br/strings.js index e95caa4a88..62a3f9b55a 100644 --- a/src/nls/pt-br/strings.js +++ b/src/nls/pt-br/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviação", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do Modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrição", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão do Arquivo" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão do Arquivo", + "TABBAR_SHOW_HIDDEN_TABS": "Mostrar abas ocultas" }); \ No newline at end of file diff --git a/src/nls/pt-pt/lastTranslated.json b/src/nls/pt-pt/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/pt-pt/lastTranslated.json +++ b/src/nls/pt-pt/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/pt-pt/strings.js b/src/nls/pt-pt/strings.js index 8b0b343e9c..e3883a43b6 100644 --- a/src/nls/pt-pt/strings.js +++ b/src/nls/pt-pt/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviatura", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Texto do Modelo", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descrição", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão de Ficheiro" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensão de Ficheiro", + "TABBAR_SHOW_HIDDEN_TABS": "Mostrar separadores ocultos" }); \ No newline at end of file diff --git a/src/nls/ro/lastTranslated.json b/src/nls/ro/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/ro/lastTranslated.json +++ b/src/nls/ro/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/ro/strings.js b/src/nls/ro/strings.js index c55b320538..9d5c6323ef 100644 --- a/src/nls/ro/strings.js +++ b/src/nls/ro/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abreviere", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text șablon", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Descriere", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensie fișier" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Extensie fișier", + "TABBAR_SHOW_HIDDEN_TABS": "Afișează filele ascunse" }); \ No newline at end of file diff --git a/src/nls/ru/lastTranslated.json b/src/nls/ru/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/ru/lastTranslated.json +++ b/src/nls/ru/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/ru/strings.js b/src/nls/ru/strings.js index 4f1447a52b..0c19744c44 100644 --- a/src/nls/ru/strings.js +++ b/src/nls/ru/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Сокращение", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблона", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Описание", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Расширение файла" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Расширение файла", + "TABBAR_SHOW_HIDDEN_TABS": "Показать скрытые вкладки" }); \ No newline at end of file diff --git a/src/nls/sk/lastTranslated.json b/src/nls/sk/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/sk/lastTranslated.json +++ b/src/nls/sk/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/sk/strings.js b/src/nls/sk/strings.js index 1924b308b1..f7e59e247f 100644 --- a/src/nls/sk/strings.js +++ b/src/nls/sk/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Skratka", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Text šablóny", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Popis", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Prípona súboru" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Prípona súboru", + "TABBAR_SHOW_HIDDEN_TABS": "Zobraziť skryté karty" }); \ No newline at end of file diff --git a/src/nls/sr/lastTranslated.json b/src/nls/sr/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/sr/lastTranslated.json +++ b/src/nls/sr/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/sr/strings.js b/src/nls/sr/strings.js index 526191fa01..ef60afb4c1 100644 --- a/src/nls/sr/strings.js +++ b/src/nls/sr/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Скраћеница", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблона", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Опис", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Екстензија датотеке" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Екстензија датотеке", + "TABBAR_SHOW_HIDDEN_TABS": "Прикажи скривене картице" }); \ No newline at end of file diff --git a/src/nls/sv/lastTranslated.json b/src/nls/sv/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/sv/lastTranslated.json +++ b/src/nls/sv/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/sv/strings.js b/src/nls/sv/strings.js index 0cde38ea38..79804a7ddf 100644 --- a/src/nls/sv/strings.js +++ b/src/nls/sv/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Förkortning", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Malltext", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Beskrivning", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filändelse" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Filändelse", + "TABBAR_SHOW_HIDDEN_TABS": "Visa dolda flikar" }); \ No newline at end of file diff --git a/src/nls/tr/lastTranslated.json b/src/nls/tr/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/tr/lastTranslated.json +++ b/src/nls/tr/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/tr/strings.js b/src/nls/tr/strings.js index 04b29acaa3..20c2ab2e90 100644 --- a/src/nls/tr/strings.js +++ b/src/nls/tr/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Kısaltma", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Şablon Metni", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Açıklama", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dosya Uzantısı" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Dosya Uzantısı", + "TABBAR_SHOW_HIDDEN_TABS": "Gizli sekmeleri göster" }); \ No newline at end of file diff --git a/src/nls/uk/lastTranslated.json b/src/nls/uk/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/uk/lastTranslated.json +++ b/src/nls/uk/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/uk/strings.js b/src/nls/uk/strings.js index 4446a69b5b..d0abc058b1 100644 --- a/src/nls/uk/strings.js +++ b/src/nls/uk/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Скорочення", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Текст шаблону", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Опис", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Розширення файлу" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "Розширення файлу", + "TABBAR_SHOW_HIDDEN_TABS": "Показати приховані вкладки" }); \ No newline at end of file diff --git a/src/nls/ur/lastTranslated.json b/src/nls/ur/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/ur/lastTranslated.json +++ b/src/nls/ur/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/ur/strings.js b/src/nls/ur/strings.js index f02f47b676..dc9c44bde2 100644 --- a/src/nls/ur/strings.js +++ b/src/nls/ur/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "مخفف", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "ٹیمپلیٹ متن", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "وضاحت", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "فائل ایکسٹینشن" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "فائل ایکسٹینشن", + "TABBAR_SHOW_HIDDEN_TABS": "پوشیدہ ٹیبز دکھائیں" }); \ No newline at end of file diff --git a/src/nls/zh-cn/lastTranslated.json b/src/nls/zh-cn/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/zh-cn/lastTranslated.json +++ b/src/nls/zh-cn/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 14ac904e36..778bd53cac 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "缩写", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "模板文本", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "描述", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "文件扩展名" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "文件扩展名", + "TABBAR_SHOW_HIDDEN_TABS": "显示隐藏的标签页" }); \ No newline at end of file diff --git a/src/nls/zh-tw/lastTranslated.json b/src/nls/zh-tw/lastTranslated.json index ed05f64c99..2c991b0beb 100644 --- a/src/nls/zh-tw/lastTranslated.json +++ b/src/nls/zh-tw/lastTranslated.json @@ -1319,6 +1319,7 @@ "SURVEY_TITLE_VOTE_FOR_FEATURES_YOU_WANT": "Vote for the features you want to see next!", "SYSTEM_CONFIGURATION": "System configuration", "SYSTEM_DEFAULT": "System Default", + "TABBAR_SHOW_HIDDEN_TABS": "Show hidden tabs", "TAG_NAME": "Tag", "TAG_NAME_PLACEHOLDER": "Enter tag name here…", "TARGET_BRANCH": "Target branch", diff --git a/src/nls/zh-tw/strings.js b/src/nls/zh-tw/strings.js index a75c32ecc6..0e75a3b83a 100644 --- a/src/nls/zh-tw/strings.js +++ b/src/nls/zh-tw/strings.js @@ -1457,5 +1457,6 @@ define({ "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "縮寫", "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "範本文字", "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "描述", - "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "檔案副檔名" + "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "檔案副檔名", + "TABBAR_SHOW_HIDDEN_TABS": "顯示隱藏的索引標籤" }); \ No newline at end of file From 89fe45fee26458498f0fd6c32e72055708c1655e Mon Sep 17 00:00:00 2001 From: abose Date: Mon, 1 Sep 2025 13:26:22 +0530 Subject: [PATCH 203/849] fix: pro logo doesnt go away on logout on top left navbar --- src/index.html | 2 +- src/services/profile-menu.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 9e287c2feb..13f8831710 100644 --- a/src/index.html +++ b/src/index.html @@ -350,7 +350,7 @@ baseURL: _getBaseURL(), isTestWindow: _isTestWindow(), firstBoot: false, // will be set below - pro: {}, + pro: {}, // this is only for display purposes and should not be used to gate features. use kernal mode for that startTime: Date.now(), TRUSTED_ORIGINS: { // if modifying this list, make sure to update in https://github.com/phcode-dev/phcode.live/blob/main/docs/trustedOrigins.js diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index 7390539a11..151451c9c7 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -190,12 +190,13 @@ define(function (require, exports, module) { function _updateBranding(entitlements) { const $brandingLink = $("#phcode-io-main-nav"); if (!entitlements) { + // Phoenix.pro is only for display purposes and should not be used to gate features. + // Use kernal mode apis for trusted check of pro features. Phoenix.pro.plan = { paidSubscriber: false, name: "Community Edition", isInTrial: false }; - return; } if (entitlements && entitlements.plan){ From e69c2acf84a8a8f066ec582347ff52b33233f1cc Mon Sep 17 00:00:00 2001 From: abose Date: Tue, 2 Sep 2025 10:45:26 +0530 Subject: [PATCH 204/849] feat: add promotions infra --- src/phoenix/trust_ring.js | 2 + src/services/login-service.js | 1 + src/services/profile-menu.js | 4 +- src/services/promotions.js | 280 ++++++++++++++++++++++++++++++++++ src/utils/Metrics.js | 3 +- test/spec/SpecRunnerUtils.js | 8 + 6 files changed, 294 insertions(+), 4 deletions(-) create mode 100644 src/services/promotions.js diff --git a/src/phoenix/trust_ring.js b/src/phoenix/trust_ring.js index 0cd11fa29f..019d47f4e3 100644 --- a/src/phoenix/trust_ring.js +++ b/src/phoenix/trust_ring.js @@ -179,6 +179,7 @@ function _selectKeys() { } const CRED_KEY_API = "API_KEY"; +const CRED_KEY_ENTITLEMENTS = "ENTITLEMENTS_GRANT_KEY"; const { key, iv } = _selectKeys(); // this key is set at boot time as a truct base for all the core components before any extensions are loaded. // just before extensions are loaded, this key is blanked. This can be used by core modules to talk with other @@ -186,6 +187,7 @@ const { key, iv } = _selectKeys(); // KernalModeTrust should only be available within all code that loads before the first default/any extension. window.KernalModeTrust = { CRED_KEY_API, + CRED_KEY_ENTITLEMENTS, aesKeys: { key, iv }, setCredential, getCredential, diff --git a/src/services/login-service.js b/src/services/login-service.js index 96a1cf765a..bc1ff66211 100644 --- a/src/services/login-service.js +++ b/src/services/login-service.js @@ -24,6 +24,7 @@ */ define(function (require, exports, module) { + const Promotions = require("./promotions"); const KernalModeTrust = window.KernalModeTrust; if(!KernalModeTrust){ diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index 151451c9c7..bb8f3916e8 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -194,8 +194,7 @@ define(function (require, exports, module) { // Use kernal mode apis for trusted check of pro features. Phoenix.pro.plan = { paidSubscriber: false, - name: "Community Edition", - isInTrial: false + name: "Community Edition" }; } @@ -203,7 +202,6 @@ define(function (require, exports, module) { Phoenix.pro.plan = { paidSubscriber: entitlements.plan.paidSubscriber, name: entitlements.plan.name, - isInTrial: entitlements.plan.isInTrial, validTill: entitlements.plan.validTill }; } diff --git a/src/services/promotions.js b/src/services/promotions.js new file mode 100644 index 0000000000..edaef78682 --- /dev/null +++ b/src/services/promotions.js @@ -0,0 +1,280 @@ +/* + * GNU AGPL-3.0 License + * + * Copyright (c) 2021 - present core.ai . All rights reserved. + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see https://opensource.org/licenses/AGPL-3.0. + * + */ + +/*global logger*/ + +/** + * Promotions Service + * + * Manages pro trial promotions for both native and browser applications. + * Provides loginless pro trials + * + * - First install: 30-day trial on first usage + * - Subsequent versions: 3-day trial (or remaining from 30-day if still valid) + * - Older versions: No new trial, but existing 30-day trial remains valid + */ + +define(function (require, exports, module) { + + const EventDispatcher = require("utils/EventDispatcher"), + Metrics = require("utils/Metrics"), + semver = require("thirdparty/semver.browser"); + + const KernalModeTrust = window.KernalModeTrust; + if (!KernalModeTrust) { + throw new Error("Promotions service requires access to KernalModeTrust. Cannot boot without trust ring"); + } + + // Make this module an event dispatcher + EventDispatcher.makeEventDispatcher(exports); + + // Constants + const EVENT_PRO_UPGRADE_ON_INSTALL = "pro_upgrade_on_install"; + const TRIAL_POLL_MS = 10 * 1000; // 10 seconds after start, we assign a free trial if possible + const FIRST_INSTALL_TRIAL_DAYS = 30; + const SUBSEQUENT_TRIAL_DAYS = 3; + const MS_PER_DAY = 24 * 60 * 60 * 1000; + + /** + * Generate SHA-256 signature for trial data integrity + */ + async function _generateSignature(proVersion, endDate) { + const salt = window.AppConfig ? window.AppConfig.version : "default-salt"; + const data = proVersion + "|" + endDate + "|" + salt; + + // Use browser crypto API for SHA-256 hashing + const encoder = new TextEncoder(); + const dataBuffer = encoder.encode(data); + const hashBuffer = await crypto.subtle.digest('SHA-256', dataBuffer); + const hashArray = Array.from(new Uint8Array(hashBuffer)); + return hashArray.map(b => b.toString(16).padStart(2, '0')).join(''); // hash hex string + } + + /** + * Validate trial data signature + */ + async function _isValidSignature(trialData) { + if (!trialData.signature || !trialData.proVersion || !trialData.endDate) { + return false; + } + + const expectedSignature = await _generateSignature(trialData.proVersion, trialData.endDate); + return trialData.signature === expectedSignature; + } + + /** + * Get stored trial data with validation + */ + async function _getTrialData() { + try { + if (Phoenix.isNativeApp) { + // Native app: use KernalModeTrust credential store + const data = await KernalModeTrust.getCredential(KernalModeTrust.CRED_KEY_ENTITLEMENTS); + if (!data) { + return null; + } + const parsed = JSON.parse(data); + return (await _isValidSignature(parsed)) ? parsed : null; + } else { + // Browser app: use virtual filesystem + return new Promise((resolve) => { + // app support dir in browser is /fs/app/ + const filePath = Phoenix.app.getApplicationSupportDirectory() + "entitlements_granted.json"; + window.fs.readFile(filePath, 'utf8', function (err, data) { + if (err || !data) { + resolve(null); + return; + } + try { + const parsed = JSON.parse(data); + _isValidSignature(parsed).then(isValid => { + resolve(isValid ? parsed : null); + }).catch(() => resolve(null)); + } catch (e) { + resolve(null); + } + }); + }); + } + } catch (error) { + console.error("Error getting trial data:", error); + return null; + } + } + + /** + * Store trial data with signature + */ + async function _setTrialData(trialData) { + trialData.signature = await _generateSignature(trialData.proVersion, trialData.endDate); + + try { + if (Phoenix.isNativeApp) { + // Native app: use KernalModeTrust credential store + await KernalModeTrust.setCredential(KernalModeTrust.CRED_KEY_ENTITLEMENTS, JSON.stringify(trialData)); + } else { + // Browser app: use virtual filesystem + return new Promise((resolve, reject) => { + const filePath = Phoenix.app.getApplicationSupportDirectory() + "entitlements_granted.json"; + window.fs.writeFile(filePath, JSON.stringify(trialData), 'utf8', (writeErr) => { + if (writeErr) { + console.error("Error storing trial data:", writeErr); + reject(writeErr); + } else { + resolve(); + } + }); + }); + } + } catch (error) { + console.error("Error setting trial data:", error); + throw error; + } + } + + /** + * Calculate remaining trial days from end date + */ + function _calculateRemainingTrialDays(existingTrialData) { + const now = Date.now(); + const trialEndDate = existingTrialData.endDate; + + // Calculate days remaining until trial ends + const msRemaining = trialEndDate - now; + return Math.max(0, Math.ceil(msRemaining / MS_PER_DAY)); // days remaining + } + + /** + * Check if version1 is newer than version2 using semver + */ + function _isNewerVersion(version1, version2) { + try { + return semver.gt(version1, version2); + } catch (error) { + console.error("Error comparing versions:", error, version1, version2); + // Assume not newer if comparison fails + return false; + } + } + + /** + * Check if pro trial is currently activated + */ + async function isProTrialActivated() { + const trialData = await _getTrialData(); + if (!trialData) { + return false; + } + + const remainingDays = _calculateRemainingTrialDays(trialData); + + return remainingDays > 0; + } + + async function activateProTrial() { + const currentVersion = window.AppConfig ? window.AppConfig.apiVersion : "1.0.0"; + const existingTrialData = await _getTrialData(); + + let trialDays = FIRST_INSTALL_TRIAL_DAYS; + let endDate; + const now = Date.now(); + let metricString = `${currentVersion.replaceAll(".", "_")}`; // 3.1.0 -> 3_1_0 + + if (existingTrialData) { + // Existing trial found + const remainingDays = _calculateRemainingTrialDays(existingTrialData); + const trialVersion = existingTrialData.proVersion; + const isNewerVersion = _isNewerVersion(currentVersion, trialVersion); + + // Check if we should grant any trial + if (remainingDays <= 0 && !isNewerVersion) { + console.log("Existing trial expired, same/older version - no new trial"); + return; + } + + // Determine trial days and end date + if (isNewerVersion) { + if (remainingDays >= SUBSEQUENT_TRIAL_DAYS) { + // Newer version but existing trial is longer - keep existing + console.log(`Newer version, keeping existing trial (${remainingDays} days)`); + trialDays = remainingDays; + endDate = existingTrialData.endDate; + metricString = `nD_${metricString}_upgrade`; + } else { + // Newer version with shorter existing trial - give 3 days + console.log(`Newer version - granting ${SUBSEQUENT_TRIAL_DAYS} days trial`); + trialDays = SUBSEQUENT_TRIAL_DAYS; + endDate = now + (trialDays * MS_PER_DAY); + metricString = `3D_${metricString}`; + } + } else { + // Same/older version: keep existing trial - no changes needed + console.log(`Same/older version - keeping existing ${remainingDays} day trial.`); + return; + } + } else { + // First install - 30 days from now + endDate = now + (FIRST_INSTALL_TRIAL_DAYS * MS_PER_DAY); + metricString = `1Mo_${metricString}`; + } + + const trialData = { + proVersion: currentVersion, + endDate: endDate + }; + + await _setTrialData(trialData); + Metrics.countEvent(Metrics.EVENT_TYPE.PRO, "trialAct", metricString); + Metrics.countEvent(Metrics.EVENT_TYPE.PRO, "trial", "activated"); + console.log(`Pro trial activated for ${trialDays} days`); + + // Trigger the event for UI to handle + exports.trigger(EVENT_PRO_UPGRADE_ON_INSTALL, { + trialDays: trialDays, + isFirstInstall: !existingTrialData + }); + } + + function _isAnyDialogsVisible() { + const $modal = $(`.modal.instance`); + return $modal.length > 0 && $modal.is(':visible'); + } + + /** + * Start the pro trial activation process + * Waits 2 minutes, then triggers the upgrade event + */ + console.log(`Checking pro trial activation in ${TRIAL_POLL_MS / 1000} seconds...`); + + const trialActivatePoller = setInterval(()=> { + if(_isAnyDialogsVisible()){ + // maybe the user hasn't dismissed the new project dialog + return; + } + clearInterval(trialActivatePoller); + activateProTrial().catch(error => { + Metrics.countEvent(Metrics.EVENT_TYPE.PRO, "trial", `errActivate`); + logger.reportError(error, "Error activating pro trial:"); + }); + }, TRIAL_POLL_MS); + + // Public exports + exports.isProTrialActivated = isProTrialActivated; + exports.EVENT_PRO_UPGRADE_ON_INSTALL = EVENT_PRO_UPGRADE_ON_INSTALL; + +}); diff --git a/src/utils/Metrics.js b/src/utils/Metrics.js index 8108cc79fd..7f5e21e720 100644 --- a/src/utils/Metrics.js +++ b/src/utils/Metrics.js @@ -120,7 +120,8 @@ define(function (require, exports, module) { NODEJS: "node", LINT: "lint", GIT: "git", - AUTH: "auth" + AUTH: "auth", + PRO: "pro" }; /** diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js index 51869dc1e3..871d3938af 100644 --- a/test/spec/SpecRunnerUtils.js +++ b/test/spec/SpecRunnerUtils.js @@ -554,6 +554,10 @@ define(function (require, exports, module) { await awaitsForDone(promise); } + /** + * Waits for any modal dialogs to appear, waits for default for 2 seconds + * note: this is a test-only/short task function and shouldn't be used in production as this polls + */ async function waitForModalDialog(timeout=2000) { // Make sure there's one and only one dialog open await awaitsFor(()=>{ @@ -562,6 +566,10 @@ define(function (require, exports, module) { }, timeout); } + /** + * Waits for any modal dialogs to close, waits for default for 2 seconds + * note: this is a test-only/short task function and shouldn't be used in production as this polls + */ async function waitForNoModalDialog(timeout=2000) { // Make sure there's one and only one dialog open await awaitsFor(()=>{ From ed70df7d0669363f6a1b82f9bccb9941887e325f Mon Sep 17 00:00:00 2001 From: abose Date: Tue, 2 Sep 2025 12:33:09 +0530 Subject: [PATCH 205/849] refactor: secure KernalModeTrust.loginService --- src/services/login-browser.js | 39 +++++++------------------- src/services/login-desktop.js | 37 +++++++++++-------------- src/services/login-service.js | 25 +++++++++-------- src/services/profile-menu.js | 4 ++- src/services/promotions.js | 16 +++++------ src/services/setup-login-service.js | 43 +++++++++++++++++++++++++++++ 6 files changed, 94 insertions(+), 70 deletions(-) create mode 100644 src/services/setup-login-service.js diff --git a/src/services/login-browser.js b/src/services/login-browser.js index be0c15fab0..8e0dd953cf 100644 --- a/src/services/login-browser.js +++ b/src/services/login-browser.js @@ -43,15 +43,14 @@ */ define(function (require, exports, module) { - const EventDispatcher = require("utils/EventDispatcher"), - PreferencesManager = require("preferences/PreferencesManager"), + require("./login-service"); // after this, loginService will be in KernalModeTrust + const PreferencesManager = require("preferences/PreferencesManager"), Metrics = require("utils/Metrics"), Dialogs = require("widgets/Dialogs"), DefaultDialogs = require("widgets/DefaultDialogs"), Strings = require("strings"), StringUtils = require("utils/StringUtils"), ProfileMenu = require("./profile-menu"), - LoginService = require("./login-service"), Mustache = require("thirdparty/mustache/mustache"), browserLoginWaitingTemplate = require("text!./html/browser-login-waiting-dialog.html"); @@ -60,11 +59,7 @@ define(function (require, exports, module) { // integrated extensions will have access to kernal mode, but not external extensions throw new Error("Browser Login service should have access to KernalModeTrust. Cannot boot without trust ring"); } - const secureExports = {}; - // Only set loginService for browser apps to avoid conflict with desktop login - if (!Phoenix.isNativeApp) { - KernalModeTrust.loginService = secureExports; - } + const LoginService = KernalModeTrust.loginService; // user profile structure: "customerID": "uuid...", "firstName":"Aa","lastName":"bb", // "email":"aaaa@sss.com", "loginTime":1750074393853, "isSuccess": true, @@ -75,14 +70,6 @@ define(function (require, exports, module) { // just used as trigger to notify different windows about user profile changes const PREF_USER_PROFILE_VERSION = "userProfileVersion"; - EventDispatcher.makeEventDispatcher(exports); - EventDispatcher.makeEventDispatcher(secureExports); - - const _EVT_PAGE_FOCUSED = "page_focused"; - $(window).focus(function () { - exports.trigger(_EVT_PAGE_FOCUSED); - }); - function isLoggedIn() { return isLoggedInUser; } @@ -199,7 +186,6 @@ define(function (require, exports, module) { } let loginWaitingDialog = null; - let focusCheckInterval = null; /** * Show waiting dialog with auto-detection and manual check options @@ -288,10 +274,6 @@ define(function (require, exports, module) { loginWaitingDialog.close(); loginWaitingDialog = null; } - if (focusCheckInterval) { - clearInterval(focusCheckInterval); - focusCheckInterval = null; - } $(window).off('focus.loginWaiting'); } @@ -413,14 +395,13 @@ define(function (require, exports, module) { if (!Phoenix.isNativeApp) { init(); // kernal exports - secureExports.isLoggedIn = isLoggedIn; - secureExports.signInToAccount = signInToBrowser; - secureExports.signOutAccount = signOutBrowser; - secureExports.getProfile = getProfile; - secureExports.verifyLoginStatus = () => _verifyBrowserLogin(false); - secureExports.getAccountBaseURL = _getAccountBaseURL; - secureExports.getEntitlements = LoginService.getEntitlements; - secureExports.EVENT_ENTITLEMENTS_CHANGED = LoginService.EVENT_ENTITLEMENTS_CHANGED; + // Add to existing KernalModeTrust.loginService from login-service.js + LoginService.isLoggedIn = isLoggedIn; + LoginService.signInToAccount = signInToBrowser; + LoginService.signOutAccount = signOutBrowser; + LoginService.getProfile = getProfile; + LoginService.verifyLoginStatus = () => _verifyBrowserLogin(false); + LoginService.getAccountBaseURL = _getAccountBaseURL; } // public exports diff --git a/src/services/login-desktop.js b/src/services/login-desktop.js index 163f0e25dc..8ead917b97 100644 --- a/src/services/login-desktop.js +++ b/src/services/login-desktop.js @@ -19,6 +19,8 @@ /*global logger*/ define(function (require, exports, module) { + require("./login-service"); // after this, loginService will be in KernalModeTrust + const EventDispatcher = require("utils/EventDispatcher"), PreferencesManager = require("preferences/PreferencesManager"), Metrics = require("utils/Metrics"), @@ -27,7 +29,6 @@ define(function (require, exports, module) { Strings = require("strings"), NativeApp = require("utils/NativeApp"), ProfileMenu = require("./profile-menu"), - LoginService = require("./login-service"), Mustache = require("thirdparty/mustache/mustache"), NodeConnector = require("NodeConnector"), otpDialogTemplate = require("text!./html/otp-dialog.html"); @@ -37,11 +38,8 @@ define(function (require, exports, module) { // integrated extensions will have access to kernal mode, but not external extensions throw new Error("Login service should have access to KernalModeTrust. Cannot boot without trust ring"); } - const secureExports = {}; - // Only set loginService for native apps to avoid conflict with browser login - if (Phoenix.isNativeApp) { - KernalModeTrust.loginService = secureExports; - } + const LoginService = KernalModeTrust.loginService; + // user profile is something like "apiKey": "uuid...", validationCode: "dfdf", "firstName":"Aa","lastName":"bb", // "email":"aaaa@sss.com", "customerID":"uuid...","loginTime":1750074393853, // "profileIcon":{"color":"#14b8a6","initials":"AB"} @@ -51,12 +49,11 @@ define(function (require, exports, module) { // just used as trigger to notify different windows about user profile changes const PREF_USER_PROFILE_VERSION = "userProfileVersion"; - EventDispatcher.makeEventDispatcher(exports); - EventDispatcher.makeEventDispatcher(secureExports); - const _EVT_PAGE_FOCUSED = "page_focused"; + const focusWatcher = {}; + EventDispatcher.makeEventDispatcher(focusWatcher); $(window).focus(function () { - exports.trigger(_EVT_PAGE_FOCUSED); + focusWatcher.trigger(_EVT_PAGE_FOCUSED); }); const AUTH_CONNECTOR_ID = "ph_auth"; @@ -320,7 +317,7 @@ define(function (require, exports, module) { } } let isAutoSignedIn = false; - exports.on(_EVT_PAGE_FOCUSED, checkLoginStatus); + focusWatcher.on(_EVT_PAGE_FOCUSED, checkLoginStatus); async function _AutoSignedIn() { isAutoSignedIn = true; await checkLoginStatus(); @@ -329,7 +326,7 @@ define(function (require, exports, module) { // Clean up when dialog is closed dialog.done(function() { - exports.off(_EVT_PAGE_FOCUSED, checkLoginStatus); + focusWatcher.off(_EVT_PAGE_FOCUSED, checkLoginStatus); authNodeConnector.off(EVENT_CONNECTED, _AutoSignedIn); clearTimeout(closeTimeout); Metrics.countEvent(Metrics.EVENT_TYPE.AUTH, @@ -411,15 +408,13 @@ define(function (require, exports, module) { // Only set exports for native apps to avoid conflict with browser login if (Phoenix.isNativeApp) { init(); - // kernal exports - secureExports.isLoggedIn = isLoggedIn; - secureExports.signInToAccount = signInToAccount; - secureExports.signOutAccount = signOutAccount; - secureExports.getProfile = getProfile; - secureExports.verifyLoginStatus = () => _verifyLogin(false); - secureExports.getAccountBaseURL = getAccountBaseURL; - secureExports.getEntitlements = LoginService.getEntitlements; - secureExports.EVENT_ENTITLEMENTS_CHANGED = LoginService.EVENT_ENTITLEMENTS_CHANGED; + // kernal exports - add to existing KernalModeTrust.loginService from login-service.js + LoginService.isLoggedIn = isLoggedIn; + LoginService.signInToAccount = signInToAccount; + LoginService.signOutAccount = signOutAccount; + LoginService.getProfile = getProfile; + LoginService.verifyLoginStatus = () => _verifyLogin(false); + LoginService.getAccountBaseURL = getAccountBaseURL; } // public exports diff --git a/src/services/login-service.js b/src/services/login-service.js index bc1ff66211..6fe2d6b271 100644 --- a/src/services/login-service.js +++ b/src/services/login-service.js @@ -24,7 +24,8 @@ */ define(function (require, exports, module) { - const Promotions = require("./promotions"); + require("./setup-login-service"); // this adds loginService to KernalModeTrust + require("./promotions"); const KernalModeTrust = window.KernalModeTrust; if(!KernalModeTrust){ @@ -32,6 +33,8 @@ define(function (require, exports, module) { throw new Error("Login service should have access to KernalModeTrust. Cannot boot without trust ring"); } + const LoginService = KernalModeTrust.loginService; + // Event constants const EVENT_ENTITLEMENTS_CHANGED = "entitlements_changed"; @@ -44,7 +47,7 @@ define(function (require, exports, module) { */ async function getEntitlements(forceRefresh = false) { // Return null if not logged in - if (!KernalModeTrust.loginService.isLoggedIn()) { + if (!LoginService.isLoggedIn()) { return null; } @@ -54,7 +57,7 @@ define(function (require, exports, module) { } try { - const accountBaseURL = KernalModeTrust.loginService.getAccountBaseURL(); + const accountBaseURL = LoginService.getAccountBaseURL(); const language = Phoenix.app && Phoenix.app.language ? Phoenix.app.language : 'en'; let url = `${accountBaseURL}/getAppEntitlements?lang=${language}`; let fetchOptions = { @@ -67,7 +70,7 @@ define(function (require, exports, module) { // Handle different authentication methods for browser vs desktop if (Phoenix.isNativeApp) { // Desktop app: use appSessionID and validationCode - const profile = KernalModeTrust.loginService.getProfile(); + const profile = LoginService.getProfile(); if (profile && profile.apiKey && profile.validationCode) { url += `&appSessionID=${encodeURIComponent(profile.apiKey)}&validationCode=${encodeURIComponent(profile.validationCode)}`; } else { @@ -91,7 +94,7 @@ define(function (require, exports, module) { // Trigger event if entitlements changed if (entitlementsChanged) { - KernalModeTrust.loginService.trigger(EVENT_ENTITLEMENTS_CHANGED, result); + LoginService.trigger(EVENT_ENTITLEMENTS_CHANGED, result); } return cachedEntitlements; @@ -113,14 +116,14 @@ define(function (require, exports, module) { cachedEntitlements = null; // Trigger event when entitlements are cleared - if (KernalModeTrust.loginService.trigger) { - KernalModeTrust.loginService.trigger(EVENT_ENTITLEMENTS_CHANGED, null); + if (LoginService.trigger) { + LoginService.trigger(EVENT_ENTITLEMENTS_CHANGED, null); } } } - // Exports - exports.EVENT_ENTITLEMENTS_CHANGED = EVENT_ENTITLEMENTS_CHANGED; - exports.getEntitlements = getEntitlements; - exports.clearEntitlements = clearEntitlements; + // Add functions to secure exports + LoginService.getEntitlements = getEntitlements; + LoginService.clearEntitlements = clearEntitlements; + LoginService.EVENT_ENTITLEMENTS_CHANGED = EVENT_ENTITLEMENTS_CHANGED; }); diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index bb8f3916e8..045a42c8d1 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -539,7 +539,7 @@ define(function (require, exports, module) { _removeProfileIcon(); // Clear cached entitlements when user logs out - LoginService.clearEntitlements(); + KernalModeTrust.loginService.clearEntitlements(); // Reset branding to free mode _updateBranding(null); @@ -563,4 +563,6 @@ define(function (require, exports, module) { exports.init = init; exports.setNotLoggedIn = setNotLoggedIn; exports.setLoggedIn = setLoggedIn; + + // dont public exports things that extensions can use to get/put credentials and entitlements, display mods is fine }); diff --git a/src/services/promotions.js b/src/services/promotions.js index edaef78682..4fbfe938fe 100644 --- a/src/services/promotions.js +++ b/src/services/promotions.js @@ -31,8 +31,8 @@ define(function (require, exports, module) { - const EventDispatcher = require("utils/EventDispatcher"), - Metrics = require("utils/Metrics"), + require("./setup-login-service"); // this adds loginService to KernalModeTrust + const Metrics = require("utils/Metrics"), semver = require("thirdparty/semver.browser"); const KernalModeTrust = window.KernalModeTrust; @@ -40,8 +40,7 @@ define(function (require, exports, module) { throw new Error("Promotions service requires access to KernalModeTrust. Cannot boot without trust ring"); } - // Make this module an event dispatcher - EventDispatcher.makeEventDispatcher(exports); + const LoginService = KernalModeTrust.loginService; // Constants const EVENT_PRO_UPGRADE_ON_INSTALL = "pro_upgrade_on_install"; @@ -244,7 +243,7 @@ define(function (require, exports, module) { console.log(`Pro trial activated for ${trialDays} days`); // Trigger the event for UI to handle - exports.trigger(EVENT_PRO_UPGRADE_ON_INSTALL, { + LoginService.trigger(EVENT_PRO_UPGRADE_ON_INSTALL, { trialDays: trialDays, isFirstInstall: !existingTrialData }); @@ -273,8 +272,9 @@ define(function (require, exports, module) { }); }, TRIAL_POLL_MS); - // Public exports - exports.isProTrialActivated = isProTrialActivated; - exports.EVENT_PRO_UPGRADE_ON_INSTALL = EVENT_PRO_UPGRADE_ON_INSTALL; + // Add to secure exports + LoginService.isProTrialActivated = isProTrialActivated; + LoginService.EVENT_PRO_UPGRADE_ON_INSTALL = EVENT_PRO_UPGRADE_ON_INSTALL; + // no public exports to prevent extension tampering }); diff --git a/src/services/setup-login-service.js b/src/services/setup-login-service.js new file mode 100644 index 0000000000..1c8804d22d --- /dev/null +++ b/src/services/setup-login-service.js @@ -0,0 +1,43 @@ +/* + * GNU AGPL-3.0 License + * + * Copyright (c) 2021 - present core.ai . All rights reserved. + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see https://opensource.org/licenses/AGPL-3.0. + * + */ + +/** + * Shared Login Service kernal mode trust setup + * + * This module contains shared login service functionality used by both + * browser and desktop login implementations, including entitlements management. + */ + +define(function (require, exports, module) { + const EventDispatcher = require("utils/EventDispatcher"); + + const KernalModeTrust = window.KernalModeTrust; + if(!KernalModeTrust){ + // integrated extensions will have access to kernal mode, but not external extensions + throw new Error("Login service should have access to KernalModeTrust. Cannot boot without trust ring"); + } + + // Create secure exports and set up KernalModeTrust.loginService + const secureExports = {}; + EventDispatcher.makeEventDispatcher(secureExports); + + // Set up loginService for both native and browser apps + KernalModeTrust.loginService = secureExports; + + // no public exports to prevent extension tampering +}); From d1887b08fc75d1200b5910d15936bf95e3ee9120 Mon Sep 17 00:00:00 2001 From: abose Date: Tue, 2 Sep 2025 12:54:17 +0530 Subject: [PATCH 206/849] fix: clicking on phoenix pro title on new project window does nothing --- src/assets/new-project/assets/js/code-editor.js | 6 +++++- src/assets/new-project/code-editor.html | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/assets/new-project/assets/js/code-editor.js b/src/assets/new-project/assets/js/code-editor.js index d8e82c4033..22de25f873 100644 --- a/src/assets/new-project/assets/js/code-editor.js +++ b/src/assets/new-project/assets/js/code-editor.js @@ -186,7 +186,7 @@ function _openURLInTauri(url) { function _updateProBranding() { try { const $freeTitle = $('.phoenix-free-title'); - const $proTitle = $('.phoenix-pro-title'); + const $proTitle = $('#phoenix-pro-title'); const $proTitleSpan = $('.pro-plan-name'); if (!$freeTitle.length || !$proTitle.length || !$proTitleSpan.length) { @@ -222,6 +222,10 @@ function initCodeEditor() { Metrics.countEvent(Metrics.EVENT_TYPE.NEW_PROJECT, "main.Click", "viewMore"); window.location.href = 'new-project-more.html'; }; + document.getElementById("phoenix-pro-title").onclick = function() { + Metrics.countEvent(Metrics.EVENT_TYPE.NEW_PROJECT, "main.Click", "proTitle"); + _openURLInTauri("https://account.phcode.dev"); + }; document.getElementById("githubStarsButton").onclick = function() { Metrics.countEvent(Metrics.EVENT_TYPE.NEW_PROJECT, "main.Click", "githubStars"); _openURLInTauri("https://github.com/phcode-dev/phoenix"); diff --git a/src/assets/new-project/code-editor.html b/src/assets/new-project/code-editor.html index 6362e1adf2..eb0f86a489 100644 --- a/src/assets/new-project/code-editor.html +++ b/src/assets/new-project/code-editor.html @@ -16,7 +16,7 @@ + +
+

{{{title}}}

+
+ +
+
+

+ {{message}} +

+ +
+ +
+ {{Strings.PROMO_CARD_1}} +
+

{{Strings.PROMO_CARD_1}}

+

{{Strings.PROMO_CARD_1_MESSAGE}}

+
+
+ + +
+ {{Strings.PROMO_CARD_2}} +
+

{{Strings.PROMO_CARD_2}}

+

{{Strings.PROMO_CARD_2_MESSAGE}}

+
+
+ + +
+ {{Strings.PROMO_CARD_3}} +
+

{{Strings.PROMO_CARD_3}}

+

{{Strings.PROMO_CARD_3_MESSAGE}}

+
+
+ + +
+ {{Strings.PROMO_CARD_4}} +
+

{{Strings.PROMO_CARD_4}}

+

{{Strings.PROMO_CARD_4_MESSAGE}}

+
+
+
+
+
+ +
+ + +
+
diff --git a/src/services/pro-dialogs.js b/src/services/pro-dialogs.js new file mode 100644 index 0000000000..6ae51b12ee --- /dev/null +++ b/src/services/pro-dialogs.js @@ -0,0 +1,53 @@ +/* + * GNU AGPL-3.0 License + * + * Copyright (c) 2021 - present core.ai . All rights reserved. + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see https://opensource.org/licenses/AGPL-3.0. + * + */ + +/*global logger*/ + +/** + * Phoenix pro pre and post promo dialogs + * shows dialog where we give Phoenix pro to all users on app install + * and dialogs on pro trial ends. + * + */ + +define(function (require, exports, module) { + const proTitle = ` + Phoenix Pro + + `; + require("./setup-login-service"); // this adds loginService to KernalModeTrust + const Dialogs = require("widgets/Dialogs"), + Mustache = require("thirdparty/mustache/mustache"), + Strings = require("strings"), + StringUtils = require("utils/StringUtils"), + proUpgradeHTML = require("text!./html/pro-upgrade.html"); + + function showProUpgradeDialog(trialDays) { + const title = StringUtils.format(Strings.PROMO_UPGRADE_TITLE, proTitle); + const message = StringUtils.format(Strings.PROMO_UPGRADE_MESSAGE, trialDays); + const $template = $(Mustache.render(proUpgradeHTML, {title, message, Strings})); + Dialogs.showModalDialogUsingTemplate($template).done(function (id) { + console.log("Dialog closed with id: " + id); + if(id === 'learn_more') { + Phoenix.app.openURLInDefaultBrowser(brackets.config.homepage_url); + } + }); + } + + exports.showProUpgradeDialog = showProUpgradeDialog; +}); diff --git a/src/services/promotions.js b/src/services/promotions.js index 4fbfe938fe..dff787f786 100644 --- a/src/services/promotions.js +++ b/src/services/promotions.js @@ -33,7 +33,8 @@ define(function (require, exports, module) { require("./setup-login-service"); // this adds loginService to KernalModeTrust const Metrics = require("utils/Metrics"), - semver = require("thirdparty/semver.browser"); + semver = require("thirdparty/semver.browser"), + ProDialogs = require("./pro-dialogs"); const KernalModeTrust = window.KernalModeTrust; if (!KernalModeTrust) { @@ -242,6 +243,7 @@ define(function (require, exports, module) { Metrics.countEvent(Metrics.EVENT_TYPE.PRO, "trial", "activated"); console.log(`Pro trial activated for ${trialDays} days`); + ProDialogs.showProUpgradeDialog(trialDays); // Trigger the event for UI to handle LoginService.trigger(EVENT_PRO_UPGRADE_ON_INSTALL, { trialDays: trialDays, diff --git a/src/styles/brackets.less b/src/styles/brackets.less index 933ae3a304..b16a4208d3 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -83,7 +83,7 @@ html, body { } #phcode-io-main-nav.phoenix-pro{ - background: @phoenix-pro-gradient; + background: @phoenix-pro-gradient-dark; background-clip: text; -webkit-background-clip: text; /* Chrome, Safari */ color: transparent; /* works in Firefox */ diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index 8221598fbd..0417784d97 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -281,10 +281,19 @@ @dark-css-codehint-icon: #146a41; // phoenix pro -@phoenix-pro-gradient: linear-gradient( +@phoenix-pro-gradient-dark: linear-gradient( 45deg, #ff8c42, /* deep orange */ #ffa500, /* bright orange */ #ffcc70, /* golden yellow */ #ffd700 /* rich gold */ ); + +@phoenix-pro-gradient-light: linear-gradient( + 45deg, + #cc5500 0%, /* burnt orange */ + #ff7a1a 25%, /* strong orange */ + #ff9900 50%, /* vibrant orange-gold */ + #e6a600 75%, /* darker amber */ + #c99700 100% /* rich golden brown */ +); From 99ef3704ccabbc8152587f9e25dddcf2022786da Mon Sep 17 00:00:00 2001 From: abose Date: Tue, 2 Sep 2025 19:11:28 +0530 Subject: [PATCH 208/849] chore: phoenix pro dialog light theme support --- src/services/html/pro-upgrade.html | 96 +------------- src/styles/brackets.less | 1 + src/styles/brackets_core_ui_variables.less | 2 +- src/styles/phoenix-pro.less | 140 +++++++++++++++++++++ 4 files changed, 143 insertions(+), 96 deletions(-) create mode 100644 src/styles/phoenix-pro.less diff --git a/src/services/html/pro-upgrade.html b/src/services/html/pro-upgrade.html index 79696b8dbe..323aa91509 100644 --- a/src/services/html/pro-upgrade.html +++ b/src/services/html/pro-upgrade.html @@ -1,105 +1,11 @@