diff --git a/build.json b/build.json index 3d16b729b40..df8cb28651d 100644 --- a/build.json +++ b/build.json @@ -1,6 +1,6 @@ { - "version": "release-1.10-prerelease-1", + "version": "release-1.10-prerelease-2", "title" : "Brackets 1.10 Pre-release for community testing", - "description" : "This is a Brackets 1.10 pre-release build. This release contains fix for custom font-family issues, support for Quick Docs for HTML documents and migration of Quick Docs to MDN for both HTML and CSS.", + "description" : "This is a Brackets 1.10 pre-release build. This release adds native menus for Linux, Search History UI, pseudo selector and AtRules hints in CSS, CSS hints in style attribute value for HTML documents.", "prerelease": true } diff --git a/src/LiveDevelopment/Agents/RemoteFunctions.js b/src/LiveDevelopment/Agents/RemoteFunctions.js index d3afeec7604..cb11e072c26 100644 --- a/src/LiveDevelopment/Agents/RemoteFunctions.js +++ b/src/LiveDevelopment/Agents/RemoteFunctions.js @@ -431,19 +431,37 @@ function RemoteFunctions(config, remoteWSPort) { highlight.className = HIGHLIGHT_CLASSNAME; var offset = _screenOffset(element); + + var el = element, + offsetLeft = 0, + offsetTop = 0; + + // Probably the easiest way to get elements position without including transform + do { + offsetLeft += el.offsetLeft; + offsetTop += el.offsetTop; + el = el.offsetParent; + } while(el); var stylesToSet = { - "left": offset.left + "px", - "top": offset.top + "px", - "width": elementBounds.width + "px", - "height": elementBounds.height + "px", + "left": offsetLeft + "px", + "top": offsetTop + "px", + "width": innerWidth + "px", + "height": innerHeight + "px", "z-index": 2000000, "margin": 0, "padding": 0, "position": "absolute", "pointer-events": "none", "box-shadow": "0 0 1px #fff", - "box-sizing": "border-box" + "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'), + "transform": elementStyling.getPropertyValue('transform'), + "transform-origin": elementStyling.getPropertyValue('transform-origin'), + "border-color": config.remoteHighlight.borderColor }; var mergedStyles = Object.assign({}, stylesToSet, config.remoteHighlight.stylesToSet); diff --git a/test/spec/ProjectManager-test.js b/test/spec/ProjectManager-test.js index f2534816cde..a2f4af64e97 100644 --- a/test/spec/ProjectManager-test.js +++ b/test/spec/ProjectManager-test.js @@ -50,7 +50,7 @@ define(function (require, exports, module) { // copy files to temp directory runs(function () { - waitsForDone(SpecRunnerUtils.copy(testPath, tempDir), "copy temp files"); + waitsForDone(SpecRunnerUtils.copyPath(testPath, tempDir), "copy temp files"); }); runs(function () {