raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrading Foundation, starting to work through regression issues

Browse Source
This commit is contained in:
Will Marshall
2014-03-24 15:40:33 +11:00
parent 0690fcda48
commit bf7d12b40e
11 changed files with 88 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/darkswarm/all.js.coffee
View File

@@ -13,4 +13,4 @@
$ ->
$(document).foundation()
$(document).foundation('reveal', {animation: 'fade'})
$(document).foundation({reveal: {animation: 'fade'}})

38
app/assets/javascripts/darkswarm/overrides.js.coffee
View File

@@ -1,20 +1,20 @@
Foundation.libs.section.toggle_active = (e)->
$this = $(this)
self = Foundation.libs.section
region = $this.parent()
content = $this.siblings(self.settings.content_selector)
section = region.parent()
settings = $.extend({}, self.settings, self.data_options(section))
prev_active_region = section.children(self.settings.region_selector).filter("." + self.settings.active_class)
#Foundation.libs.section.toggle_active = (e)->
#$this = $(this)
#self = Foundation.libs.section
#region = $this.parent()
#content = $this.siblings(self.settings.content_selector)
#section = region.parent()
#settings = $.extend({}, self.settings, self.data_options(section))
#prev_active_region = section.children(self.settings.region_selector).filter("." + self.settings.active_class)
#for anchors inside [data-section-title]
e.preventDefault() if not settings.deep_linking and content.length > 0
e.stopPropagation() #do not catch same click again on parent
unless region.hasClass(self.settings.active_class)
prev_active_region.removeClass self.settings.active_class
region.addClass self.settings.active_class
#force resize for better performance (do not wait timer)
self.resize region.find(self.settings.section_selector).not("[" + self.settings.resized_data_attr + "]"), true
else if not settings.one_up# and (self.small(section) or self.is_vertical_nav(section) or self.is_horizontal_nav(section) or self.is_accordion(section))
region.removeClass self.settings.active_class
settings.callback section
##for anchors inside [data-section-title]
#e.preventDefault() if not settings.deep_linking and content.length > 0
#e.stopPropagation() #do not catch same click again on parent
#unless region.hasClass(self.settings.active_class)
#prev_active_region.removeClass self.settings.active_class
#region.addClass self.settings.active_class
##force resize for better performance (do not wait timer)
#self.resize region.find(self.settings.section_selector).not("[" + self.settings.resized_data_attr + "]"), true
#else if not settings.one_up# and (self.small(section) or self.is_vertical_nav(section) or self.is_horizontal_nav(section) or self.is_accordion(section))
#region.removeClass self.settings.active_class
#settings.callback section

3
app/assets/javascripts/search/all.js
View File

@@ -11,5 +11,8 @@
//= require spin
//= require foundation
//= require_tree .
//
// Hacky fix for issue - http://foundation.zurb.com/forum/posts/2112-foundation-5100-syntax-error-in-js
Foundation.set_namespace = function() {};
$(function(){ $(document).foundation(); });