Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only return first matching selector, instead of the full selector text

Browse Source
This commit is contained in:
Kovid Goyal 2014-05-19 09:30:09 +05:30
parent f0286d3aa4
commit 215f6a94d6
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/compiled_coffeescript.zip
View File

Binary file not shown.

26
src/calibre/ebooks/oeb/polish/preview.coffee
View File

@ -156,19 +156,17 @@ get_style_properties = (style, all_properties, node_style, is_ancestor) ->
property = style.item(i)?.toLowerCase() property = style.item(i)?.toLowerCase()
val = style.getPropertyValue(property) val = style.getPropertyValue(property)
if property and val and (not is_ancestor or INHERITED_PROPS.hasOwnProperty(property)) if property and val and (not is_ancestor or INHERITED_PROPS.hasOwnProperty(property))
properties.push([property, val]) properties.push([property, val, style.getPropertyPriority(property)])
if not all_properties.hasOwnProperty(property) if not all_properties.hasOwnProperty(property)
all_properties[property] = node_style.getPropertyValue(property) all_properties[property] = node_style.getPropertyValue(property)
i += 1 i += 1
return properties return properties
process_rules = (node, cssRules, address, sheet, matching_selectors, all_properties, node_style, is_ancestor, ans) -> process_rules = (node, cssRules, address, sheet, sheet_index, matching_selectors, all_properties, node_style, is_ancestor, ans) ->
num = -1 for rule, rule_index in cssRules
for rule in cssRules rule_address = address + [rule_index]
num += 1
rule_address = address + [num]
if rule.type == CSSRule.MEDIA_RULE if rule.type == CSSRule.MEDIA_RULE
process_rules(node, rule.cssRules, rule_address, sheet, matching_selectors, all_properties, node_style, is_ancestor, ans) process_rules(node, rule.cssRules, rule_address, sheet, sheet_index, matching_selectors, all_properties, node_style, is_ancestor, ans)
continue continue
if rule.type != CSSRule.STYLE_RULE if rule.type != CSSRule.STYLE_RULE
continue continue
@ -183,9 +181,15 @@ process_rules = (node, cssRules, address, sheet, matching_selectors, all_propert
if href == null if href == null
href = get_sourceline_address(sheet.ownerNode) href = get_sourceline_address(sheet.ownerNode)
type = 'elem' type = 'elem'
parts = st.split(',') # We only want the first matching selector
if parts.length > 1
for q in parts
if node.webkitMatchesSelector(q)
st = q
break
properties = get_style_properties(rule.style, all_properties, node_style, is_ancestor) properties = get_style_properties(rule.style, all_properties, node_style, is_ancestor)
if properties.length > 0 if properties.length > 0
data = {'selector':st, 'type':type, 'href':href, 'properties':properties, 'is_ancestor':is_ancestor, 'rule_address':rule_address} data = {'selector':st, 'type':type, 'href':href, 'properties':properties, 'is_ancestor':is_ancestor, 'rule_address':rule_address, 'sheet_index':sheet_index}
ans.push(data) ans.push(data)
get_matched_css = (node, is_ancestor, all_properties) -> get_matched_css = (node, is_ancestor, all_properties) ->
@ -199,15 +203,15 @@ get_matched_css = (node, is_ancestor, all_properties) ->
ans = [] ans = []
node_style = window.getComputedStyle(node) node_style = window.getComputedStyle(node)
for sheet in document.styleSheets for sheet, sheet_index in document.styleSheets
if sheet.disabled if sheet.disabled
continue continue
process_rules(node, sheet.cssRules, [], sheet, matching_selectors, all_properties, node_style, is_ancestor, ans) process_rules(node, sheet.cssRules, [], sheet, sheet_index, matching_selectors, all_properties, node_style, is_ancestor, ans)
if node.getAttribute('style') if node.getAttribute('style')
properties = get_style_properties(node.style, all_properties, node_style, is_ancestor) properties = get_style_properties(node.style, all_properties, node_style, is_ancestor)
if properties.length > 0 if properties.length > 0
data = {'selector':null, 'type':'inline', 'href':get_sourceline_address(node), 'properties':properties, 'is_ancestor':is_ancestor, 'rule_address':null} data = {'selector':null, 'type':'inline', 'href':get_sourceline_address(node), 'properties':properties, 'is_ancestor':is_ancestor, 'rule_address':null, 'sheet_index':null}
ans.push(data) ans.push(data)
return ans.reverse() return ans.reverse()