Skip to content

Commit

Permalink
Merge pull request #132 from Shopify/fix-safari-no-styles
Browse files Browse the repository at this point in the history
Fix safari no styles
  • Loading branch information
Mathew Allen authored Aug 29, 2016
2 parents 963bd8b + 7b62ecb commit 34a2581
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions lib/assets/javascripts/turbograft/turbohead.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ updateScriptTags = (activeDocument, newScripts, callback) ->
)

extractTrackedAssets = (doc) ->
for node in doc.head.children when node.dataset.turbolinksTrack?
node
[].slice.call(doc.querySelectorAll('[data-turbolinks-track]'))

filterForNodeType = (nodeType) ->
(node) -> node.nodeName == nodeType
Expand Down
2 changes: 1 addition & 1 deletion test/javascripts/turbolinks_test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe 'Turbolinks', ->

visit = ({options, url}, callback) ->
$(document).one('page:load', (event) ->
setTimeout((-> callback(event)), 0)
setTimeout((-> callback(event) if callback), 0)
)
Turbolinks.visit('/' + url, options)

Expand Down

0 comments on commit 34a2581

Please sign in to comment.