codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get jQuery selectors highlighting again

Browse source
This commit is contained in:
Phoenix Eliot 2016-09-15 16:44:21 -07:00
parent 5314c60fd9
commit 56de72410a
1 changed files with 9 additions and 3 deletions

12
app/views/play/level/WebSurfaceView.coffee
View file

@ -92,6 +92,7 @@ module.exports = class WebSurfaceView extends CocoView
rawCss = styleNode.children[0].nodeValue rawCss = styleNode.children[0].nodeValue
@rawCssLines ?= [] @rawCssLines ?= []
@rawCssLines = @rawCssLines.concat(rawCss.split('\n')) @rawCssLines = @rawCssLines.concat(rawCss.split('\n'))
@rawJQueryLines = _.filter (html.split('\n').map (line) -> (line.match(/^.*\$\(\s*['"].*['"]\s*\).*$/g) or [])[0])
# TODO: Move this hack for extracting CSS selectors # TODO: Move this hack for extracting CSS selectors
cssSelectors = _.flatten dekuStyles.children.map (styleNode) -> cssSelectors = _.flatten dekuStyles.children.map (styleNode) ->
rawCss = styleNode.children[0].nodeValue rawCss = styleNode.children[0].nodeValue
@ -124,10 +125,15 @@ module.exports = class WebSurfaceView extends CocoView
trimLine = (line.match(/\s(.*)\s*{/)?[1] or line).trim().split(/ +/).join(' ') trimLine = (line.match(/\s(.*)\s*{/)?[1] or line).trim().split(/ +/).join(' ')
hoveredCssSelector = _.find @cssSelectors, (selector) -> hoveredCssSelector = _.find @cssSelectors, (selector) ->
trimLine is selector trimLine is selector
@iframe.contentWindow.postMessage({ type: 'highlight-css-selector', selector: hoveredCssSelector }, '*') else if _.contains(@rawJQueryLines, line)
# It's a jQuery call
trimLine = (line.match(/\$\(\s*['"](.*)['"]\s*\)/)?[1] or '').trim()
hoveredCssSelector = _.find @cssSelectors, (selector) ->
trimLine is selector
else else
# They're not hovering over CSS, so don't highlight anything # They're not hovering over a line with a selector, so don't highlight anything
@iframe.contentWindow.postMessage({ type: 'highlight-css-selector', selector: '' }, '*') hoveredCssSelector = ''
@iframe.contentWindow.postMessage({ type: 'highlight-css-selector', selector: hoveredCssSelector }, '*')
null null
onIframeMessage: (event) => onIframeMessage: (event) =>