Wichtige Hinweise
-
-
Die Edirom-Summer-School findet in diesem Jahr vom 8.–12.9.2014 statt. Nähere Informationen zum Veranstaltungsprogramm und den Teilnahmebedingungen erhalten Sie in Kürze hier.
-
-
-
-
+
+
Ab sofort ist es möglich, sich für die Kurse der Edirom-Summer-School anzumelden .
+
+
Informationen zum Kursprogramm erhalten Sie hier .
+
+
31. Juli 2014
+
+
Wir erheben einen Unkostenbeitrag von 5,– Euro pro Halbtag.
-
Wir freuen uns mitzuteilen, dass wir in diesem Jahr im Rahmen des EADH Small Grants Programms ein Studentenstipendium für die Teilnahme an der Edirom-Summer-School vergeben können. Informationen zu den Teilnahmebedingungen erhalten Sie in Kürze hier.
+
Wir freuen uns mitzuteilen, dass wir in diesem Jahr im Rahmen des EADH Small Grants Programms ein Studentenstipendium für die Teilnahme an der Edirom-Summer-School vergeben können. Die Bewerbung ist ab sofort bis zum 20. Juli 2014 möglich. Informationen zum Bewerbungsverfahren erhalten Sie hier .
Wir gehen davon aus, dass Sie am besten mit Ihrem vertrauten eigenen Rechner arbeiten können.
Falls Sie keinen Rechner mitbringen können, melden Sie sich bitte bei uns und wir werden versuchen, über die Universität Paderborn Ihnen einen Rechner für die Dauer Ihrer Teilnahme an der ESS zur Verfügung zu stellen.
diff --git a/javascripts/ess.forms.js b/javascripts/ess.forms.js
index ca17c1a..7852987 100644
--- a/javascripts/ess.forms.js
+++ b/javascripts/ess.forms.js
@@ -1,17 +1,17 @@
var KursList = [
- {"KursID":"tei-einf", "Termin":[1,2,3], "Counter":0},
- {"KursID":"mei-einf", "Termin":[5,6,7], "Counter":0},
- {"KursID":"mermeid", "Termin":[8,9], "Counter":0},
- {"KursID":"qs", "Termin":[4], "Counter":0},
- {"KursID":"musikCodierung", "Termin":[8,9], "Counter":0},
- {"KursID":"textGrid", "Termin":[6,7], "Counter":0},
- {"KursID":"odd", "Termin":[2], "Counter":0},
- {"KursID":"xslt", "Termin":[8,9], "Counter":0},
- {"KursID":"kdm", "Termin":[1], "Counter":0},
- {"KursID":"ms", "Termin":[4,5], "Counter":0},
- {"KursID":"edirom", "Termin":[2,3], "Counter":0},
- {"KursID":"xpath", "Termin":[4,5], "Counter":0},
- {"KursID":"ks-vok", "Termin":[6,7], "Counter":0}
+ {"KursID":"dariah", "Termin":[1], "Counter":0},
+ {"KursID":"edirom", "Termin":[2,5], "Counter":0},
+ {"KursID":"euf", "Termin":[], "Counter":0},
+ {"KursID":"mei-rendering", "Termin":[3], "Counter":0},
+ {"KursID":"kdm", "Termin":[], "Counter":0},
+ {"KursID":"mei-einf", "Termin":[1,4], "Counter":0},
+ {"KursID":"mei-einf-en", "Termin":[1,4], "Counter":0},
+ {"KursID":"mermeid", "Termin":[3], "Counter":0},
+ {"KursID":"odd", "Termin":[2,3], "Counter":0},
+ {"KursID":"python", "Termin":[5], "Counter":0},
+ {"KursID":"tei-einf", "Termin":[3,4], "Counter":0},
+ {"KursID":"xpath", "Termin":[1], "Counter":0},
+ {"KursID":"xslt", "Termin":[2,3], "Counter":0}
];
var errorText = '
Ungültige Eingabe ';
diff --git a/javascripts/foundation/foundation.abide.js b/javascripts/foundation/foundation.abide.js
new file mode 100644
index 0000000..f624f83
--- /dev/null
+++ b/javascripts/foundation/foundation.abide.js
@@ -0,0 +1,194 @@
+/*jslint unparam: true, browser: true, indent: 2 */
+
+;(function ($, window, document, undefined) {
+ 'use strict';
+
+ Foundation.libs.abide = {
+ name : 'abide',
+
+ version : '4.3.2',
+
+ settings : {
+ live_validate : true,
+ focus_on_invalid : true,
+ timeout : 1000,
+ patterns : {
+ alpha: /[a-zA-Z]+/,
+ alpha_numeric : /[a-zA-Z0-9]+/,
+ integer: /-?\d+/,
+ number: /-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?/,
+
+ // generic password: upper-case, lower-case, number/special character, and min 8 characters
+ password : /(?=^.{8,}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/,
+
+ // amex, visa, diners
+ card : /^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\d{3})\d{11})$/,
+ cvv : /^([0-9]){3,4}$/,
+
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#valid-e-mail-address
+ email : /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
+
+ url: /(https?|ftp|file|ssh):\/\/(((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?/,
+ // abc.de
+ domain: /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$/,
+
+ datetime: /([0-2][0-9]{3})\-([0-1][0-9])\-([0-3][0-9])T([0-5][0-9])\:([0-5][0-9])\:([0-5][0-9])(Z|([\-\+]([0-1][0-9])\:00))/,
+ // YYYY-MM-DD
+ date: /(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))/,
+ // HH:MM:SS
+ time : /(0[0-9]|1[0-9]|2[0-3])(:[0-5][0-9]){2}/,
+ dateISO: /\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/,
+ // MM/DD/YYYY
+ month_day_year : /(0[1-9]|1[012])[- \/.](0[1-9]|[12][0-9]|3[01])[- \/.](19|20)\d\d/,
+
+ // #FFF or #FFFFFF
+ color: /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/
+ }
+ },
+
+ timer : null,
+
+ init : function (scope, method, options) {
+ if (typeof method === 'object') {
+ $.extend(true, this.settings, method);
+ }
+
+ if (typeof method !== 'string') {
+ if (!this.settings.init) { this.events(); }
+
+ } else {
+ return this[method].call(this, options);
+ }
+ },
+
+ events : function () {
+ var self = this,
+ forms = $('form[data-abide]', this.scope).attr('novalidate', 'novalidate');
+
+ forms
+ .on('submit validate', function (e) {
+ return self.validate($(this).find('input, textarea, select').get(), e);
+ });
+
+ this.settings.init = true;
+
+ if (!this.settings.live_validate) return;
+
+ forms
+ .find('input, textarea, select')
+ .on('blur change', function (e) {
+ self.validate([this], e);
+ })
+ .on('keydown', function (e) {
+ clearTimeout(self.timer);
+ self.timer = setTimeout(function () {
+ self.validate([this], e);
+ }.bind(this), self.settings.timeout);
+ });
+ },
+
+ validate : function (els, e) {
+ var validations = this.parse_patterns(els),
+ validation_count = validations.length,
+ form = $(els[0]).closest('form');
+
+ for (var i=0; i < validation_count; i++) {
+ if (!validations[i] && /submit/.test(e.type)) {
+ if (this.settings.focus_on_invalid) els[i].focus();
+ form.trigger('invalid');
+ $(els[i]).closest('form').attr('data-invalid', '');
+ return false;
+ }
+ }
+
+ if (/submit/.test(e.type)) {
+ form.trigger('valid');
+ }
+
+ form.removeAttr('data-invalid');
+
+ return true;
+ },
+
+ parse_patterns : function (els) {
+ var count = els.length,
+ el_patterns = [];
+
+ for (var i = count - 1; i >= 0; i--) {
+ el_patterns.push(this.pattern(els[i]));
+ }
+
+ return this.check_validation_and_apply_styles(el_patterns);
+ },
+
+ pattern : function (el) {
+ var type = el.getAttribute('type'),
+ required = typeof el.getAttribute('required') === 'string';
+
+ if (this.settings.patterns.hasOwnProperty(type)) {
+ return [el, this.settings.patterns[type], required];
+ }
+
+ var pattern = el.getAttribute('pattern') || '';
+
+ if (this.settings.patterns.hasOwnProperty(pattern) && pattern.length > 0) {
+ return [el, this.settings.patterns[pattern], required];
+ } else if (pattern.length > 0) {
+ return [el, new RegExp(pattern), required];
+ }
+
+ pattern = /.*/;
+
+ return [el, pattern, required];
+ },
+
+ check_validation_and_apply_styles : function (el_patterns) {
+ var count = el_patterns.length,
+ validations = [];
+
+ for (var i = count - 1; i >= 0; i--) {
+ var el = el_patterns[i][0],
+ required = el_patterns[i][2],
+ value = el.value,
+ is_radio = el.type === "radio",
+ valid_length = (required) ? (el.value.length > 0) : true;
+
+ if (is_radio && required) {
+ validations.push(this.valid_radio(el, required));
+ } else {
+ if (el_patterns[i][1].test(value) && valid_length ||
+ !required && el.value.length < 1) {
+ $(el).removeAttr('data-invalid').parent().removeClass('error');
+ validations.push(true);
+ } else {
+ $(el).attr('data-invalid', '').parent().addClass('error');
+ validations.push(false);
+ }
+ }
+ }
+
+ return validations;
+ },
+
+ valid_radio : function (el, required) {
+ var name = el.getAttribute('name'),
+ group = document.getElementsByName(name),
+ count = group.length,
+ valid = false;
+
+ for (var i=0; i < count; i++) {
+ if (group[i].checked) valid = true;
+ }
+
+ for (var i=0; i < count; i++) {
+ if (valid) {
+ $(group[i]).removeAttr('data-invalid').parent().removeClass('error');
+ } else {
+ $(group[i]).attr('data-invalid', '').parent().addClass('error');
+ }
+ }
+
+ return valid;
+ }
+ };
+}(Foundation.zj, this, this.document));
\ No newline at end of file
diff --git a/javascripts/foundation/foundation.alerts.js b/javascripts/foundation/foundation.alerts.js
index 8e4522d..63dada0 100644
--- a/javascripts/foundation/foundation.alerts.js
+++ b/javascripts/foundation/foundation.alerts.js
@@ -6,15 +6,17 @@
Foundation.libs.alerts = {
name : 'alerts',
- version : '4.2.2',
+ version : '4.3.2',
settings : {
+ animation: 'fadeOut',
speed: 300, // fade out speed
callback: function (){}
},
init : function (scope, method, options) {
this.scope = scope || this.scope;
+ Foundation.inherit(this, 'data_options');
if (typeof method === 'object') {
$.extend(true, this.settings, method);
@@ -33,10 +35,13 @@
var self = this;
$(this.scope).on('click.fndtn.alerts', '[data-alert] a.close', function (e) {
+ var alertBox = $(this).closest("[data-alert]"),
+ settings = $.extend({}, self.settings, self.data_options(alertBox));
+
e.preventDefault();
- $(this).closest("[data-alert]").fadeOut(self.speed, function () {
+ alertBox[settings.animation](settings.speed, function () {
$(this).remove();
- self.settings.callback();
+ settings.callback();
});
});
@@ -49,4 +54,4 @@
reflow : function () {}
};
-}(Foundation.zj, this, this.document));
\ No newline at end of file
+}(Foundation.zj, this, this.document));
diff --git a/javascripts/foundation/foundation.clearing.js b/javascripts/foundation/foundation.clearing.js
index e9a8624..a63b53e 100644
--- a/javascripts/foundation/foundation.clearing.js
+++ b/javascripts/foundation/foundation.clearing.js
@@ -6,7 +6,7 @@
Foundation.libs.clearing = {
name : 'clearing',
- version : '4.2.2',
+ version: '4.3.2',
settings : {
templates : {
@@ -228,7 +228,7 @@
},
is_open : function (current) {
- return current.parent().attr('style').length > 0;
+ return current.parent().prop('style').length > 0;
},
keydown : function (e) {
diff --git a/javascripts/foundation/foundation.dropdown.js b/javascripts/foundation/foundation.dropdown.js
index 6058854..62f1164 100644
--- a/javascripts/foundation/foundation.dropdown.js
+++ b/javascripts/foundation/foundation.dropdown.js
@@ -6,7 +6,7 @@
Foundation.libs.dropdown = {
name : 'dropdown',
- version : '4.2.0',
+ version : '4.3.2',
settings : {
activeClass: 'open',
@@ -57,13 +57,15 @@
.on('opened.fndtn.dropdown', '[data-dropdown-content]', this.settings.opened)
.on('closed.fndtn.dropdown', '[data-dropdown-content]', this.settings.closed);
- $('body').on('click.fndtn.dropdown', function (e) {
+ $(document).on('click.fndtn.dropdown', function (e) {
var parent = $(e.target).closest('[data-dropdown-content]');
- if ($(e.target).data('dropdown')) {
+ if ($(e.target).data('dropdown') || $(e.target).parent().data('dropdown')) {
return;
}
- if (parent.length > 0 && ($(e.target).is('[data-dropdown-content]') || $.contains(parent.first()[0], e.target))) {
+ if (!($(e.target).data('revealId')) &&
+ (parent.length > 0 && ($(e.target).is('[data-dropdown-content]') ||
+ $.contains(parent.first()[0], e.target)))) {
e.stopPropagation();
return;
}
@@ -99,6 +101,10 @@
toggle : function (target) {
var dropdown = $('#' + target.data('dropdown'));
+ if (dropdown.length === 0) {
+ // No dropdown found, not continuing
+ return;
+ }
this.close.call(this, $('[data-dropdown-content]').not(dropdown));
@@ -121,25 +127,24 @@
css : function (dropdown, target) {
var offset_parent = dropdown.offsetParent();
- // temporary workaround until 4.2
- if (offset_parent.length > 0 && /body/i.test(dropdown.offsetParent()[0].nodeName)) {
+ // if (offset_parent.length > 0 && /body/i.test(dropdown.offsetParent()[0].nodeName)) {
var position = target.offset();
- position.top -= dropdown.offsetParent().offset().top;
- position.left -= dropdown.offsetParent().offset().left;
- } else {
- var position = target.position();
- }
+ position.top -= offset_parent.offset().top;
+ position.left -= offset_parent.offset().left;
+ // } else {
+ // var position = target.position();
+ // }
if (this.small()) {
dropdown.css({
position : 'absolute',
width: '95%',
- left: '2.5%',
'max-width': 'none',
top: position.top + this.outerHeight(target)
});
+ dropdown.css(Foundation.rtl ? 'right':'left', '2.5%');
} else {
- if (!Foundation.rtl && $(window).width() > this.outerWidth(dropdown) + target.offset().left) {
+ if (!Foundation.rtl && $(window).width() > this.outerWidth(dropdown) + target.offset().left && !this.data_options(target).align_right) {
var left = position.left;
if (dropdown.hasClass('right')) {
dropdown.removeClass('right');
diff --git a/javascripts/foundation/foundation.forms.js b/javascripts/foundation/foundation.forms.js
index 6870572..b58e92c 100644
--- a/javascripts/foundation/foundation.forms.js
+++ b/javascripts/foundation/foundation.forms.js
@@ -2,9 +2,9 @@
'use strict';
Foundation.libs.forms = {
- name: 'forms',
+ name : 'forms',
- version: '4.2.2',
+ version: '4.3.2',
cache: {},
@@ -33,14 +33,19 @@
},
assemble: function () {
- $('form.custom input[type="radio"]', $(this.scope))
- .not('[data-customforms="disabled"]')
- .not('.' + this.settings.disable_class)
- .each(this.append_custom_markup);
- $('form.custom input[type="checkbox"]', $(this.scope))
+
+ var forms = this;
+
+ $('form.custom input[type="radio"],[type="checkbox"]', $(this.scope))
.not('[data-customforms="disabled"]')
.not('.' + this.settings.disable_class)
- .each(this.append_custom_markup);
+ .each(function(idx, sel){
+ forms.set_custom_markup(sel);
+ })
+ .change(function(){
+ forms.set_custom_markup(this);
+ });
+
$('form.custom select', $(this.scope))
.not('[data-customforms="disabled"]')
.not('.' + this.settings.disable_class)
@@ -63,7 +68,7 @@
self.toggle_radio($(this));
})
.on('change.fndtn.forms', 'form.custom select', function (e, force_refresh) {
- if (!$(this).not('[data-customforms="disabled"])')) return;
+ if ($(this).is('[data-customforms="disabled"]')) return;
self.refresh_custom_select($(this), force_refresh);
})
.on('click.fndtn.forms', 'form.custom label', function (e) {
@@ -150,18 +155,33 @@
//store the old value in data
$select.data('prevalue', $oldThis.html());
- $select.trigger('change');
+
+ // Kick off full DOM change event
+ if (typeof (document.createEvent) != 'undefined') {
+ var event = document.createEvent('HTMLEvents');
+ event.initEvent('change', true, true);
+ $select[0].dispatchEvent(event);
+ } else {
+ $select[0].fireEvent('onchange'); // for IE
+ }
}
});
$(window).on('keydown', function (e) {
var focus = document.activeElement,
self = Foundation.libs.forms,
- dropdown = $('.custom.dropdown.open');
+ dropdown = $('.custom.dropdown'),
+ select = getFirstPrevSibling(dropdown, 'select'),
+ inputs = $('input,select,textarea,button'); // Zepto-compatible jQuery(":input")
- if (dropdown.length > 0) {
+ if (dropdown.length > 0 && dropdown.hasClass('open')) {
e.preventDefault();
+ if (e.which === 9) {
+ $(inputs[$(inputs).index(select) + 1]).focus();
+ dropdown.removeClass('open');
+ }
+
if (e.which === 13) {
dropdown.find('li.selected').trigger('click');
}
@@ -202,6 +222,15 @@
}
});
+ $(window).on('keyup', function (e) {
+ var focus = document.activeElement,
+ dropdown = $('.custom.dropdown');
+
+ if (focus === dropdown.find('.current')[0]) {
+ dropdown.find('.selector').focus().click();
+ }
+ });
+
this.settings.init = true;
},
@@ -232,7 +261,7 @@
}.bind(this), 10);
},
- append_custom_markup: function (idx, sel) {
+ set_custom_markup: function (sel) {
var $this = $(sel),
type = $this.attr('type'),
$span = $this.next('span.custom.' + type);
@@ -283,7 +312,7 @@
$customList.append(liHtml);
$currentSelect = $customSelect
- .prepend('
' + $selectedOption.html() + ' ')
+ .prepend('
' + ($selectedOption.html() || '') + ' ')
.find(".current");
$this.after($customSelect)
@@ -361,30 +390,27 @@
var maxWidth = 0,
$customSelect = $select.next(),
$options = $select.find('option'),
+ $customList = $customSelect.find('ul'),
$listItems = $customSelect.find('li');
- if ($listItems.length !== this.cache[$customSelect.data('id')] || force_refresh) {
- $customSelect.find('ul').html('');
+ if ($options.length !== this.cache[$customSelect.data('id')] || force_refresh) {
+ $customList.html('');
+ // rebuild and re-populate all at once
+ var customSelectHtml = '';
$options.each(function () {
- var $li = $('
' + $(this).html() + ' ');
- $customSelect.find('ul').append($li);
- });
-
- // re-populate
- $options.each(function (index) {
- if (this.selected) {
- $customSelect.find('li').eq(index).addClass('selected');
- $customSelect.find('.current').html($(this).html());
- }
- if ($(this).is(':disabled')) {
- $customSelect.find('li').eq(index).addClass('disabled');
+ var $this = $(this), thisHtml = $this.html(), thisSelected = this.selected;
+ customSelectHtml += '
' + thisHtml + ' ';
+ if (thisSelected) {
+ $customSelect.find('.current').html(thisHtml);
}
});
+ $customList.html(customSelectHtml);
+
// fix width
- $customSelect.removeAttr('style')
- .find('ul').removeAttr('style');
+ $customSelect.removeAttr('style');
+ $customList.removeAttr('style');
$customSelect.find('li').each(function () {
$customSelect.addClass('open');
if (self.outerWidth($(this)) > maxWidth) {
@@ -398,6 +424,11 @@
this.cache[$customSelect.data('id')] = $listItems.length;
}
},
+
+ refresh_custom_selection: function ($select) {
+ var selectedValue = $('option:selected', $select).text();
+ $('a.current', $select.next()).text(selectedValue);
+ },
toggle_checkbox: function ($element) {
var $input = $element.prev(),
diff --git a/javascripts/foundation/foundation.interchange.js b/javascripts/foundation/foundation.interchange.js
index 502bc9a..4c9067c 100644
--- a/javascripts/foundation/foundation.interchange.js
+++ b/javascripts/foundation/foundation.interchange.js
@@ -6,10 +6,12 @@
Foundation.libs.interchange = {
name : 'interchange',
- version : '4.2.2',
+ version : '4.2.4',
cache : {},
+ images_loaded : false,
+
settings : {
load_attr : 'interchange',
@@ -29,13 +31,11 @@
},
directives : {
- replace : function (el, path) {
+ replace: function (el, path) {
if (/IMG/.test(el[0].nodeName)) {
- var path_parts = path.split('/'),
- path_file = path_parts[path_parts.length - 1],
- orig_path = el[0].src;
+ var orig_path = el[0].src;
- if (new RegExp(path_file, 'i').test(el[0].src)) return;
+ if (new RegExp(path, 'i').test(orig_path)) return;
el[0].src = path;
@@ -73,6 +73,11 @@
resize : function () {
var cache = this.cache;
+ if(!this.images_loaded) {
+ setTimeout($.proxy(this.resize, this), 50);
+ return;
+ }
+
for (var uuid in cache) {
if (cache.hasOwnProperty(uuid)) {
var passed = this.results(uuid, cache[uuid]);
@@ -87,18 +92,17 @@
},
results : function (uuid, scenarios) {
- var count = scenarios.length,
- results_arr = [];
+ var count = scenarios.length;
if (count > 0) {
var el = $('[data-uuid="' + uuid + '"]');
for (var i = count - 1; i >= 0; i--) {
- var rule = scenarios[i][2];
+ var mq, rule = scenarios[i][2];
if (this.settings.named_queries.hasOwnProperty(rule)) {
- var mq = matchMedia(this.settings.named_queries[rule]);
+ mq = matchMedia(this.settings.named_queries[rule]);
} else {
- var mq = matchMedia(scenarios[i][2]);
+ mq = matchMedia(rule);
}
if (mq.matches) {
return {el: el, scenario: scenarios[i]};
@@ -120,12 +124,15 @@
update_images : function () {
var images = document.getElementsByTagName('img'),
count = images.length,
+ loaded_count = 0,
data_attr = 'data-' + this.settings.load_attr;
this.cached_images = [];
+ this.images_loaded = false;
for (var i = count - 1; i >= 0; i--) {
- this.loaded($(images[i]), (i === 0), function (image, last) {
+ this.loaded($(images[i]), function (image) {
+ loaded_count++;
if (image) {
var str = image.getAttribute(data_attr) || '';
@@ -134,8 +141,10 @@
}
}
- if (last) this.enhance();
-
+ if(loaded_count === count) {
+ this.images_loaded = true;
+ this.enhance();
+ }
}.bind(this));
}
@@ -145,9 +154,9 @@
// based on jquery.imageready.js
// @weblinc, @jsantell, (c) 2012
- loaded : function (image, last, callback) {
+ loaded : function (image, callback) {
function loaded () {
- callback(image[0], last);
+ callback(image[0]);
}
function bindLoad () {
diff --git a/javascripts/foundation/foundation.joyride.js b/javascripts/foundation/foundation.joyride.js
index a843dfa..627561c 100644
--- a/javascripts/foundation/foundation.joyride.js
+++ b/javascripts/foundation/foundation.joyride.js
@@ -3,10 +3,12 @@
(function ($, window, document, undefined) {
'use strict';
+ var Modernizr = Modernizr || false;
+
Foundation.libs.joyride = {
- name: 'joyride',
+ name : 'joyride',
- version : '4.2.2',
+ version : '4.3.2',
defaults : {
expose : false, // turn on or off the expose feature
@@ -42,7 +44,7 @@
expose : '
',
exposeCover: '
'
},
- exposeAddClass : '' // One or more space-separated class names to be added to exposed element
+ exposeAddClass : '' // One or more space-separated class names to be added to exposed element
},
settings : {},
@@ -121,7 +123,7 @@
integer_settings = ['timer', 'scrollSpeed', 'startOffset', 'tipAnimationFadeSpeed', 'cookieExpires'],
int_settings_count = integer_settings.length;
- if (!this.settings.init) this.init();
+ if (!this.settings.init) this.events();
// non configureable settings
this.settings.$content_el = $this;
@@ -339,7 +341,7 @@
return Modernizr.mq('only screen and (max-width: 767px)') || $('.lt-ie9').length > 0;
}
- return (this.settings.$window.width() < 767);
+ return ($(window).width() < 767);
},
hide : function () {
@@ -350,7 +352,13 @@
if (!this.settings.modal) {
$('.joyride-modal-bg').hide();
}
- this.settings.$current_tip.hide();
+
+ // Prevent scroll bouncing...wait to remove from layout
+ this.settings.$current_tip.css('visibility', 'hidden');
+ setTimeout($.proxy(function() {
+ this.hide();
+ this.css('visibility', 'visible');
+ }, this.settings.$current_tip), 0);
this.settings.postStepCallback(this.settings.$li.index(),
this.settings.$current_tip);
},
@@ -599,7 +607,7 @@
zIndex: el.css('z-index'),
position: el.css('position')
};
-
+
origClasses = el.attr('class') == null ? '' : el.attr('class');
el.css('z-index',parseInt(expose.css('z-index'))+1);
@@ -678,7 +686,7 @@
el.css('position', origCSS.position);
}
}
-
+
origClasses = el.data('orig-class');
el.attr('class', origClasses);
el.removeData('orig-classes');
diff --git a/javascripts/foundation/foundation.js b/javascripts/foundation/foundation.js
index 317885e..e9050c5 100644
--- a/javascripts/foundation/foundation.js
+++ b/javascripts/foundation/foundation.js
@@ -38,6 +38,10 @@ if (typeof jQuery === "undefined" &&
https://github.com/paulirish/matchMedia.js
*/
+ $('head').append('
');
+ $('head').append('
');
+ $('head').append('
');
+
window.matchMedia = window.matchMedia || (function( doc, undefined ) {
"use strict";
@@ -166,10 +170,18 @@ if (typeof jQuery === "undefined" &&
window.Foundation = {
name : 'Foundation',
- version : '4.2.2',
+ version : '4.3.2',
cache : {},
+ media_queries : {
+ small : $('.foundation-mq-small').css('font-family').replace(/\'/g, ''),
+ medium : $('.foundation-mq-medium').css('font-family').replace(/\'/g, ''),
+ large : $('.foundation-mq-large').css('font-family').replace(/\'/g, '')
+ },
+
+ stylesheet : $('').appendTo('head')[0].sheet,
+
init : function (scope, libraries, method, options, response, /* internal */ nc) {
var library_arr,
args = [scope, method, options, response],
@@ -231,8 +243,7 @@ if (typeof jQuery === "undefined" &&
if (this.libs.hasOwnProperty(lib)) {
this.patch(this.libs[lib]);
return this.libs[lib].init.apply(this.libs[lib], args);
- }
- else {
+ } else {
return function () {};
}
}.bind(this), lib);
@@ -267,7 +278,7 @@ if (typeof jQuery === "undefined" &&
},
random_str : function (length) {
- var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz'.split('');
+ var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
if (!length) {
length = Math.floor(Math.random() * chars.length);
@@ -386,6 +397,18 @@ if (typeof jQuery === "undefined" &&
}
return true;
+ },
+
+ addCustomRule : function(rule, media) {
+ if(media === undefined) {
+ Foundation.stylesheet.insertRule(rule, Foundation.stylesheet.cssRules.length);
+ } else {
+ var query = Foundation.media_queries[media];
+ if(query !== undefined) {
+ Foundation.stylesheet.insertRule('@media ' +
+ Foundation.media_queries[media] + '{ ' + rule + ' }');
+ }
+ }
}
},
@@ -402,7 +425,7 @@ if (typeof jQuery === "undefined" &&
return el.outerHeight();
};
- lib.outerWidth = function (el) {
+ lib.outerWidth = function (el, bool) {
if (typeof Zepto === 'function') {
return el.width();
}
@@ -426,13 +449,7 @@ if (typeof jQuery === "undefined" &&
return true;
},
- zj : function () {
- if (typeof Zepto !== 'undefined') {
- return Zepto;
- } else {
- return jQuery;
- }
- }()
+ zj : $
};
$.fn.foundation = function () {
diff --git a/javascripts/foundation/foundation.magellan.js b/javascripts/foundation/foundation.magellan.js
index 92f960b..179478a 100644
--- a/javascripts/foundation/foundation.magellan.js
+++ b/javascripts/foundation/foundation.magellan.js
@@ -6,10 +6,11 @@
Foundation.libs.magellan = {
name : 'magellan',
- version : '4.2.2',
+ version : '4.3.2',
settings : {
- activeClass: 'active'
+ activeClass: 'active',
+ threshold: 0
},
init : function (scope, method, options) {
@@ -119,7 +120,7 @@
},
set_threshold : function () {
- if (!this.settings.threshold) {
+ if (typeof this.settings.threshold !== 'number') {
this.settings.threshold = (this.fixed_magellan.length > 0) ?
this.outerHeight(this.fixed_magellan, true) : 0;
}
@@ -127,8 +128,9 @@
off : function () {
$(this.scope).off('.fndtn.magellan');
+ $(window).off('.fndtn.magellan');
},
reflow : function () {}
};
-}(Foundation.zj, this, this.document));
\ No newline at end of file
+}(Foundation.zj, this, this.document));
diff --git a/javascripts/foundation/foundation.orbit.js b/javascripts/foundation/foundation.orbit.js
index c4a80b4..1f8b92a 100644
--- a/javascripts/foundation/foundation.orbit.js
+++ b/javascripts/foundation/foundation.orbit.js
@@ -1,214 +1,219 @@
;(function ($, window, document, undefined) {
'use strict';
- Foundation.libs = Foundation.libs || {};
+ var noop = function() {};
- Foundation.libs.orbit = {
- name: 'orbit',
+ var Orbit = function(el, settings) {
+ // Don't reinitialize plugin
+ if (el.hasClass(settings.slides_container_class)) {
+ return this;
+ }
- version: '4.2.0',
+ var self = this,
+ container,
+ slides_container = el,
+ number_container,
+ bullets_container,
+ timer_container,
+ idx = 0,
+ animate,
+ timer,
+ locked = false,
+ adjust_height_after = false;
+
+ slides_container.children().first().addClass(settings.active_slide_class);
+
+ self.update_slide_number = function(index) {
+ if (settings.slide_number) {
+ number_container.find('span:first').text(parseInt(index)+1);
+ number_container.find('span:last').text(slides_container.children().length);
+ }
+ if (settings.bullets) {
+ bullets_container.children().removeClass(settings.bullets_active_class);
+ $(bullets_container.children().get(index)).addClass(settings.bullets_active_class);
+ }
+ };
+
+ self.update_active_link = function(index) {
+ var link = $('a[data-orbit-link="'+slides_container.children().eq(index).attr('data-orbit-slide')+'"]');
+ link.parents('ul').find('[data-orbit-link]').removeClass(settings.bullets_active_class);
+ link.addClass(settings.bullets_active_class);
+ };
+
+ self.build_markup = function() {
+ slides_container.wrap('
');
+ container = slides_container.parent();
+ slides_container.addClass(settings.slides_container_class);
+
+ if (settings.navigation_arrows) {
+ container.append($('
').addClass(settings.prev_class));
+ container.append($('
').addClass(settings.next_class));
+ }
- settings: {
- timer_speed: 10000,
- pause_on_hover: true,
- resume_on_mouseout: false,
- animation_speed: 500,
- bullets: true,
- stack_on_small: true,
- navigation_arrows: true,
- slide_number: true,
- container_class: 'orbit-container',
- stack_on_small_class: 'orbit-stack-on-small',
- next_class: 'orbit-next',
- prev_class: 'orbit-prev',
- timer_container_class: 'orbit-timer',
- timer_paused_class: 'paused',
- timer_progress_class: 'orbit-progress',
- slides_container_class: 'orbit-slides-container',
- bullets_container_class: 'orbit-bullets',
- bullets_active_class: 'active',
- slide_number_class: 'orbit-slide-number',
- caption_class: 'orbit-caption',
- active_slide_class: 'active',
- orbit_transition_class: 'orbit-transitioning'
- },
+ if (settings.timer) {
+ timer_container = $('
').addClass(settings.timer_container_class);
+ timer_container.append('
');
+ timer_container.append($('').addClass(settings.timer_progress_class));
+ timer_container.addClass(settings.timer_paused_class);
+ container.append(timer_container);
+ }
- init: function (scope, method, options) {
- var self = this;
- Foundation.inherit(self, 'data_options');
+ if (settings.slide_number) {
+ number_container = $('
').addClass(settings.slide_number_class);
+ number_container.append('
' + settings.slide_number_text + '
');
+ container.append(number_container);
+ }
- if (typeof method === 'object') {
- $.extend(true, self.settings, method);
+ if (settings.bullets) {
+ bullets_container = $('
').addClass(settings.bullets_container_class);
+ container.append(bullets_container);
+ slides_container.children().each(function(idx, el) {
+ var bullet = $('').attr('data-orbit-slide', idx);
+ bullets_container.append(bullet);
+ });
}
- if ($(scope).is('[data-orbit]')) {
- var scoped_self = $.extend(true, {}, self);
- scoped_self._init(idx, el);
+ if (settings.stack_on_small) {
+ container.addClass(settings.stack_on_small_class);
}
- $('[data-orbit]', scope).each(function(idx, el) {
- var scoped_self = $.extend(true, {}, self);
- scoped_self._init(idx, el);
- });
- },
+ self.update_slide_number(0);
+ self.update_active_link(0);
+ };
+
+ self._goto = function(next_idx, start_timer) {
+ // if (locked) {return false;}
+ if (next_idx === idx) {return false;}
+ if (typeof timer === 'object') {timer.restart();}
+ var slides = slides_container.children();
+
+ var dir = 'next';
+ locked = true;
+ if (next_idx < idx) {dir = 'prev';}
+ if (next_idx >= slides.length) {next_idx = 0;}
+ else if (next_idx < 0) {next_idx = slides.length - 1;}
+
+ var current = $(slides.get(idx));
+ var next = $(slides.get(next_idx));
- _container_html: function() {
- var self = this;
- return '
';
- },
+ current.css('zIndex', 2);
+ current.removeClass(settings.active_slide_class);
+ next.css('zIndex', 4).addClass(settings.active_slide_class);
- _bullets_container_html: function($slides) {
- var self = this,
- $list = $('
');
- $container.append('' + slide_number + ' of ' + total_slides + ' ');
- return $container;
- },
+ if (slides.length === 1) {callback(); return false;}
- _timer_html: function() {
- var self = this;
- if (typeof self.settings.timer_speed === 'number' && self.settings.timer_speed > 0) {
- return '';
+ var start_animation = function() {
+ if (dir === 'next') {animate.next(current, next, callback);}
+ if (dir === 'prev') {animate.prev(current, next, callback);}
+ };
+
+ if (next.height() > slides_container.height() && settings.variable_height) {
+ slides_container.animate({'height': next.height()}, 250, 'linear', start_animation);
} else {
- return '';
+ start_animation();
}
- },
-
- _next_html: function() {
- var self = this;
- return 'Next ';
- },
-
- _prev_html: function() {
- var self = this;
- return 'Prev ';
- },
-
- _init: function (idx, slider) {
- var self = this,
- $slides_container = $(slider),
- $container = $slides_container.wrap(self._container_html()).parent(),
- $slides = $slides_container.children();
-
- $.extend(true, self.settings, self.data_options($slides_container));
+ };
+
+ self.next = function(e) {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ self._goto(idx + 1);
+ };
+
+ self.prev = function(e) {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ self._goto(idx - 1);
+ };
+
+ self.link_custom = function(e) {
+ e.preventDefault();
+ var link = $(this).attr('data-orbit-link');
+ if ((typeof link === 'string') && (link = $.trim(link)) != "") {
+ var slide = container.find('[data-orbit-slide='+link+']');
+ if (slide.index() != -1) {self._goto(slide.index());}
+ }
+ };
- if (self.settings.navigation_arrows) {
- $container.append(self._prev_html());
- $container.append(self._next_html());
+ self.link_bullet = function(e) {
+ var index = $(this).attr('data-orbit-slide');
+ if ((typeof index === 'string') && (index = $.trim(index)) != "") {
+ self._goto(parseInt(index));
}
- $slides_container.addClass(self.settings.slides_container_class);
- if (self.settings.stack_on_small) {
- $container.addClass(self.settings.stack_on_small_class);
+ }
+
+ self.timer_callback = function() {
+ self._goto(idx + 1, true);
+ }
+
+ self.compute_dimensions = function() {
+ var current = $(slides_container.children().get(idx));
+ var h = current.height();
+ if (!settings.variable_height) {
+ slides_container.children().each(function(){
+ if ($(this).height() > h) { h = $(this).height(); }
+ });
}
- if (self.settings.slide_number) {
- $container.append(self._slide_number_html(1, $slides.length));
+ slides_container.height(h);
+ };
+
+ self.create_timer = function() {
+ var t = new Timer(
+ container.find('.'+settings.timer_container_class),
+ settings,
+ self.timer_callback
+ );
+ return t;
+ };
+
+ self.stop_timer = function() {
+ if (typeof timer === 'object') timer.stop();
+ };
+
+ self.toggle_timer = function() {
+ var t = container.find('.'+settings.timer_container_class);
+ if (t.hasClass(settings.timer_paused_class)) {
+ if (typeof timer === 'undefined') {timer = self.create_timer();}
+ timer.start();
}
- $container.append(self._timer_html());
- if (self.settings.bullets) {
- $container.after(self._bullets_container_html($slides));
+ else {
+ if (typeof timer === 'object') {timer.stop();}
}
- // To better support the "sliding" effect it's easier
- // if we just clone the first and last slides
- $slides_container.append($slides.first().clone().attr('data-orbit-slide',''));
- $slides_container.prepend($slides.last().clone().attr('data-orbit-slide',''));
- // Make the first "real" slide active
- $slides_container.css(Foundation.rtl ? 'marginRight' : 'marginLeft', '-100%');
- $slides.first().addClass(self.settings.active_slide_class);
-
- self._init_events($slides_container);
- self._init_dimensions($slides_container);
- self._start_timer($slides_container);
- },
-
- _init_events: function ($slides_container) {
- var self = this,
- $container = $slides_container.parent();
-
- $(window)
- .on('load.fndtn.orbit', function() {
- $slides_container.height('');
- $slides_container.height($slides_container.height($container.height()));
- $slides_container.trigger('orbit:ready');
- })
- .on('resize.fndtn.orbit', function() {
- $slides_container.height('');
- $slides_container.height($slides_container.height($container.height()));
- });
-
- $(document).on('click.fndtn.orbit', '[data-orbit-link]', function(e) {
- e.preventDefault();
- var id = $(e.currentTarget).attr('data-orbit-link'),
- $slide = $slides_container.find('[data-orbit-slide=' + id + ']').first();
-
- if ($slide.length === 1) {
- self._reset_timer($slides_container, true);
- self._goto($slides_container, $slide.index(), function() {});
- }
- });
-
- $container.siblings('.' + self.settings.bullets_container_class)
- .on('click.fndtn.orbit', '[data-orbit-slide-number]', function(e) {
- e.preventDefault();
- self._reset_timer($slides_container, true);
- self._goto($slides_container, $(e.currentTarget).data('orbit-slide-number'),function() {});
- });
-
- $container
- .on('mouseenter.fndtn.orbit', function(e) {
- if (self.settings.pause_on_hover) {
- self._stop_timer($slides_container);
- }
- })
- .on('mouseleave.fndtn.orbit', function(e) {
- if (self.settings.resume_on_mouseout) {
- self._start_timer($slides_container);
- }
- })
- .on('orbit:after-slide-change.fndtn.orbit', function(e, orbit) {
- var $slide_number = $container.find('.' + self.settings.slide_number_class);
-
- if ($slide_number.length === 1) {
- $slide_number.replaceWith(self._slide_number_html(orbit.slide_number, orbit.total_slides));
- }
- })
- .on('orbit:next-slide.fndtn.orbit click.fndtn.orbit', '.' + self.settings.next_class.split(" ").join("."), function(e) {
- e.preventDefault();
- self._reset_timer($slides_container, true);
- self._goto($slides_container, 'next', function() {});
- })
- .on('orbit:prev-slide.fndtn.orbit click.fndtn.orbit', '.' + self.settings.prev_class.split(" ").join("."), function(e) {
- e.preventDefault();
- self._reset_timer($slides_container, true);
- self._goto($slides_container, 'prev', function() {});
- })
- .on('orbit:toggle-play-pause.fndtn.orbit click.fndtn.orbit touchstart.fndtn.orbit', '.' + self.settings.timer_container_class, function(e) {
- e.preventDefault();
- var $timer = $(e.currentTarget).toggleClass(self.settings.timer_paused_class),
- $slides_container = $timer.closest('.' + self.settings.container_class)
- .find('.' + self.settings.slides_container_class);
-
- if ($timer.hasClass(self.settings.timer_paused_class)) {
- self._stop_timer($slides_container);
- } else {
- self._start_timer($slides_container);
- }
- })
- .on('touchstart.fndtn.orbit', function(e) {
- if (!e.touches) { e = e.originalEvent; }
+ };
+
+ self.init = function() {
+ self.build_markup();
+ if (settings.timer) {timer = self.create_timer(); timer.start();}
+ animate = new FadeAnimation(settings, slides_container);
+ if (settings.animation === 'slide')
+ animate = new SlideAnimation(settings, slides_container);
+ container.on('click', '.'+settings.next_class, self.next);
+ container.on('click', '.'+settings.prev_class, self.prev);
+ container.on('click', '[data-orbit-slide]', self.link_bullet);
+ container.on('click', self.toggle_timer);
+ if (settings.swipe) {
+ container.on('touchstart.fndtn.orbit', function(e) {
+ if (!e.touches) {e = e.originalEvent;}
var data = {
start_page_x: e.touches[0].pageX,
start_page_y: e.touches[0].pageY,
@@ -216,7 +221,7 @@
delta_x: 0,
is_scrolling: undefined
};
- $container.data('swipe-transition', data);
+ container.data('swipe-transition', data);
e.stopPropagation();
})
.on('touchmove.fndtn.orbit', function(e) {
@@ -224,10 +229,8 @@
// Ignore pinch/zoom events
if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
- var data = $container.data('swipe-transition');
- if (typeof data === 'undefined') {
- data = {};
- }
+ var data = container.data('swipe-transition');
+ if (typeof data === 'undefined') {data = {};}
data.delta_x = e.touches[0].pageX - data.start_page_x;
@@ -237,154 +240,193 @@
if (!data.is_scrolling && !data.active) {
e.preventDefault();
- self._stop_timer($slides_container);
- var direction = (data.delta_x < 0) ? 'next' : 'prev';
+ var direction = (data.delta_x < 0) ? (idx+1) : (idx-1);
data.active = true;
- self._goto($slides_container, direction, function() {});
+ self._goto(direction);
}
})
.on('touchend.fndtn.orbit', function(e) {
- $container.data('swipe-transition', {});
+ container.data('swipe-transition', {});
e.stopPropagation();
- });
- },
+ })
+ }
+ container.on('mouseenter.fndtn.orbit', function(e) {
+ if (settings.timer && settings.pause_on_hover) {
+ self.stop_timer();
+ }
+ })
+ .on('mouseleave.fndtn.orbit', function(e) {
+ if (settings.timer && settings.resume_on_mouseout) {
+ timer.start();
+ }
+ });
+
+ $(document).on('click', '[data-orbit-link]', self.link_custom);
+ $(window).on('resize', self.compute_dimensions);
+ $(window).on('load', self.compute_dimensions);
+ $(window).on('load', function(){
+ container.prev('.preloader').css('display', 'none');
+ });
+ slides_container.trigger('orbit:ready');
+ };
- _init_dimensions: function ($slides_container) {
- var $container = $slides_container.parent(),
- $slides = $slides_container.children();
+ self.init();
+ };
- $slides_container.css('width', $slides.length * 100 + '%');
- $slides.css('width', 100 / $slides.length + '%');
- $slides_container.height($container.height());
- $slides_container.css('width', $slides.length * 100 + '%');
- },
+ var Timer = function(el, settings, callback) {
+ var self = this,
+ duration = settings.timer_speed,
+ progress = el.find('.'+settings.timer_progress_class),
+ start,
+ timeout,
+ left = -1;
+
+ this.update_progress = function(w) {
+ var new_progress = progress.clone();
+ new_progress.attr('style', '');
+ new_progress.css('width', w+'%');
+ progress.replaceWith(new_progress);
+ progress = new_progress;
+ };
+
+ this.restart = function() {
+ clearTimeout(timeout);
+ el.addClass(settings.timer_paused_class);
+ left = -1;
+ self.update_progress(0);
+ };
+
+ this.start = function() {
+ if (!el.hasClass(settings.timer_paused_class)) {return true;}
+ left = (left === -1) ? duration : left;
+ el.removeClass(settings.timer_paused_class);
+ start = new Date().getTime();
+ progress.animate({'width': '100%'}, left, 'linear');
+ timeout = setTimeout(function() {
+ self.restart();
+ callback();
+ }, left);
+ el.trigger('orbit:timer-started')
+ };
+
+ this.stop = function() {
+ if (el.hasClass(settings.timer_paused_class)) {return true;}
+ clearTimeout(timeout);
+ el.addClass(settings.timer_paused_class);
+ var end = new Date().getTime();
+ left = left - (end - start);
+ var w = 100 - ((left / duration) * 100);
+ self.update_progress(w);
+ el.trigger('orbit:timer-stopped');
+ };
+ };
+
+ var SlideAnimation = function(settings, container) {
+ var duration = settings.animation_speed;
+ var is_rtl = ($('html[dir=rtl]').length === 1);
+ var margin = is_rtl ? 'marginRight' : 'marginLeft';
+ var animMargin = {};
+ animMargin[margin] = '0%';
+
+ this.next = function(current, next, callback) {
+ next.animate(animMargin, duration, 'linear', function() {
+ current.css(margin, '100%');
+ callback();
+ });
+ };
- _start_timer: function ($slides_container) {
- var self = this,
- $container = $slides_container.parent();
+ this.prev = function(current, prev, callback) {
+ prev.css(margin, '-100%');
+ prev.animate(animMargin, duration, 'linear', function() {
+ current.css(margin, '100%');
+ callback();
+ });
+ };
+ };
- var callback = function() {
- self._reset_timer($slides_container, false);
- self._goto($slides_container, 'next', function() {
- self._start_timer($slides_container);
- });
- };
+ var FadeAnimation = function(settings, container) {
+ var duration = settings.animation_speed;
+ var is_rtl = ($('html[dir=rtl]').length === 1);
+ var margin = is_rtl ? 'marginRight' : 'marginLeft';
- var $timer = $container.find('.' + self.settings.timer_container_class),
- $progress = $timer.find('.' + self.settings.timer_progress_class),
- progress_pct = ($progress.width() / $timer.width()),
- delay = self.settings.timer_speed - (progress_pct * self.settings.timer_speed);
+ this.next = function(current, next, callback) {
+ next.css({'margin':'0%', 'opacity':'0.01'});
+ next.animate({'opacity':'1'}, duration, 'linear', function() {
+ current.css('margin', '100%');
+ callback();
+ });
+ };
- $progress.animate({'width': '100%'}, delay, 'linear', callback);
- $slides_container.trigger('orbit:timer-started');
- },
+ this.prev = function(current, prev, callback) {
+ prev.css({'margin':'0%', 'opacity':'0.01'});
+ prev.animate({'opacity':'1'}, duration, 'linear', function() {
+ current.css('margin', '100%');
+ callback();
+ });
+ };
+ };
- _stop_timer: function ($slides_container) {
- var self = this,
- $container = $slides_container.parent(),
- $timer = $container.find('.' + self.settings.timer_container_class),
- $progress = $timer.find('.' + self.settings.timer_progress_class),
- progress_pct = $progress.width() / $timer.width();
- self._rebuild_timer($container, progress_pct * 100 + '%');
- // $progress.stop();
- $slides_container.trigger('orbit:timer-stopped');
- $timer = $container.find('.' + self.settings.timer_container_class);
- $timer.addClass(self.settings.timer_paused_class);
- },
- _reset_timer: function($slides_container, is_paused) {
- var self = this,
- $container = $slides_container.parent();
- self._rebuild_timer($container, '0%');
- if (typeof is_paused === 'boolean' && is_paused) {
- var $timer = $container.find('.' + self.settings.timer_container_class);
- $timer.addClass(self.settings.timer_paused_class);
- }
- },
+ Foundation.libs = Foundation.libs || {};
- _rebuild_timer: function ($container, width_pct) {
- // Zepto is unable to stop animations since they
- // are css-based. This is a workaround for that
- // limitation, which rebuilds the dom element
- // thus stopping the animation
- var self = this,
- $timer = $container.find('.' + self.settings.timer_container_class),
- $new_timer = $(self._timer_html()),
- $new_timer_progress = $new_timer.find('.' + self.settings.timer_progress_class);
-
- if (typeof Zepto === 'function') {
- $timer.remove();
- $container.append($new_timer);
- $new_timer_progress.css('width', width_pct);
- } else if (typeof jQuery === 'function') {
- var $progress = $timer.find('.' + self.settings.timer_progress_class);
- $progress.css('width', width_pct);
- $progress.stop();
- }
+ Foundation.libs.orbit = {
+ name: 'orbit',
+
+ version: '4.3.2',
+
+ settings: {
+ animation: 'slide',
+ timer_speed: 10000,
+ pause_on_hover: true,
+ resume_on_mouseout: false,
+ animation_speed: 500,
+ stack_on_small: false,
+ navigation_arrows: true,
+ slide_number: true,
+ slide_number_text: 'of',
+ container_class: 'orbit-container',
+ stack_on_small_class: 'orbit-stack-on-small',
+ next_class: 'orbit-next',
+ prev_class: 'orbit-prev',
+ timer_container_class: 'orbit-timer',
+ timer_paused_class: 'paused',
+ timer_progress_class: 'orbit-progress',
+ slides_container_class: 'orbit-slides-container',
+ bullets_container_class: 'orbit-bullets',
+ bullets_active_class: 'active',
+ slide_number_class: 'orbit-slide-number',
+ caption_class: 'orbit-caption',
+ active_slide_class: 'active',
+ orbit_transition_class: 'orbit-transitioning',
+ bullets: true,
+ timer: true,
+ variable_height: false,
+ swipe: true,
+ before_slide_change: noop,
+ after_slide_change: noop
},
- _goto: function($slides_container, index_or_direction, callback) {
- var self = this,
- $container = $slides_container.parent(),
- $slides = $slides_container.children(),
- $active_slide = $slides_container.find('.' + self.settings.active_slide_class),
- active_index = $active_slide.index(),
- margin_position = Foundation.rtl ? 'marginRight' : 'marginLeft';
+ init: function (scope, method, options) {
+ var self = this;
+ Foundation.inherit(self, 'data_options');
- if ($container.hasClass(self.settings.orbit_transition_class)) {
- return false;
+ if (typeof method === 'object') {
+ $.extend(true, self.settings, method);
}
- if (index_or_direction === 'prev') {
- if (active_index === 0) {
- active_index = $slides.length - 1;
- }
- else {
- active_index--;
- }
- }
- else if (index_or_direction === 'next') {
- active_index = (active_index+1) % $slides.length;
- }
- else if (typeof index_or_direction === 'number') {
- active_index = (index_or_direction % $slides.length);
- }
- if (active_index === ($slides.length - 1) && index_or_direction === 'next') {
- $slides_container.css(margin_position, '0%');
- active_index = 1;
- }
- else if (active_index === 0 && index_or_direction === 'prev') {
- $slides_container.css(margin_position, '-' + ($slides.length - 1) * 100 + '%');
- active_index = $slides.length - 2;
- }
- // Start transition, make next slide active
- $container.addClass(self.settings.orbit_transition_class);
- $active_slide.removeClass(self.settings.active_slide_class);
- $($slides[active_index]).addClass(self.settings.active_slide_class);
- // Make next bullet active
- var $bullets = $container.siblings('.' + self.settings.bullets_container_class);
- if ($bullets.length === 1) {
- $bullets.children().removeClass(self.settings.bullets_active_class);
- $($bullets.children()[active_index-1]).addClass(self.settings.bullets_active_class);
+ if ($(scope).is('[data-orbit]')) {
+ var $el = $(scope);
+ var opts = self.data_options($el);
+ new Orbit($el, $.extend({},self.settings, opts));
}
- var new_margin_left = '-' + (active_index * 100) + '%';
- // Check to see if animation will occur, otherwise perform
- // callbacks manually
- $slides_container.trigger('orbit:before-slide-change');
- if ($slides_container.css(margin_position) === new_margin_left) {
- $container.removeClass(self.settings.orbit_transition_class);
- $slides_container.trigger('orbit:after-slide-change', [{slide_number: active_index, total_slides: $slides_container.children().length - 2}]);
- callback();
- } else {
- var properties = {};
- properties[margin_position] = new_margin_left;
- $slides_container.animate(properties, self.settings.animation_speed, 'linear', function() {
- $container.removeClass(self.settings.orbit_transition_class);
- $slides_container.trigger('orbit:after-slide-change', [{slide_number: active_index, total_slides: $slides_container.children().length - 2}]);
- callback();
- });
- }
+ $('[data-orbit]', scope).each(function(idx, el) {
+ var $el = $(el);
+ var opts = self.data_options($el);
+ new Orbit($el, $.extend({},self.settings, opts));
+ });
}
};
+
+
}(Foundation.zj, this, this.document));
diff --git a/javascripts/foundation/foundation.placeholder.js b/javascripts/foundation/foundation.placeholder.js
index e503b4c..d65812e 100644
--- a/javascripts/foundation/foundation.placeholder.js
+++ b/javascripts/foundation/foundation.placeholder.js
@@ -1,179 +1,426 @@
-/*! http://mths.be/placeholder v2.0.7 by @mathias
- Modified to work with Zepto.js by ZURB
-*/
-;(function(window, document, $) {
-
- var isInputSupported = 'placeholder' in document.createElement('input'),
- isTextareaSupported = 'placeholder' in document.createElement('textarea'),
- prototype = $.fn,
- valHooks = $.valHooks,
- hooks,
- placeholder;
-
- if (isInputSupported && isTextareaSupported) {
-
- placeholder = prototype.placeholder = function() {
- return this;
- };
-
- placeholder.input = placeholder.textarea = true;
-
- } else {
-
- placeholder = prototype.placeholder = function() {
- var $this = this;
- $this
- .filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]')
- .not('.placeholder')
- .bind({
- 'focus.placeholder': clearPlaceholder,
- 'blur.placeholder': setPlaceholder
- })
- .data('placeholder-enabled', true)
- .trigger('blur.placeholder');
- return $this;
- };
-
- placeholder.input = isInputSupported;
- placeholder.textarea = isTextareaSupported;
-
- hooks = {
- 'get': function(element) {
- var $element = $(element);
- return $element.data('placeholder-enabled') && $element.hasClass('placeholder') ? '' : element.value;
- },
- 'set': function(element, value) {
- var $element = $(element);
- if (!$element.data('placeholder-enabled')) {
- return element.value = value;
- }
- if (value == '') {
- element.value = value;
- // Issue #56: Setting the placeholder causes problems if the element continues to have focus.
- if (element != document.activeElement) {
- // We can't use `triggerHandler` here because of dummy text/password inputs :(
- setPlaceholder.call(element);
- }
- } else if ($element.hasClass('placeholder')) {
- clearPlaceholder.call(element, true, value) || (element.value = value);
- } else {
- element.value = value;
- }
- // `set` can not return `undefined`; see http://jsapi.info/jquery/1.7.1/val#L2363
- return $element;
- }
- };
-
- isInputSupported || (valHooks.input = hooks);
- isTextareaSupported || (valHooks.textarea = hooks);
-
- $(function() {
- // Look for forms
- $(document).delegate('form', 'submit.placeholder', function() {
- // Clear the placeholder values so they don't get submitted
- var $inputs = $('.placeholder', this).each(clearPlaceholder);
- setTimeout(function() {
- $inputs.each(setPlaceholder);
- }, 10);
- });
- });
-
- // Clear placeholder values upon page reload
- $(window).bind('beforeunload.placeholder', function() {
- $('.placeholder').each(function() {
- this.value = '';
- });
- });
-
- }
-
- function args(elem) {
- // Return an object of element attributes
- var newAttrs = {},
- rinlinejQuery = /^jQuery\d+$/;
- $.each(elem.attributes, function(i, attr) {
- if (attr.specified && !rinlinejQuery.test(attr.name)) {
- newAttrs[attr.name] = attr.value;
- }
- });
- return newAttrs;
- }
-
- function clearPlaceholder(event, value) {
- var input = this,
- $input = $(input);
- if (input.value == $input.attr('placeholder') && $input.hasClass('placeholder')) {
- if ($input.data('placeholder-password')) {
- $input = $input.hide().next().show().attr('id', $input.removeAttr('id').data('placeholder-id'));
- // If `clearPlaceholder` was called from `$.valHooks.input.set`
- if (event === true) {
- return $input[0].value = value;
- }
- $input.focus();
- } else {
- input.value = '';
- $input.removeClass('placeholder');
- input == document.activeElement && input.select();
- }
- }
- }
-
- function setPlaceholder() {
- var $replacement,
- input = this,
- $input = $(input),
- $origInput = $input,
- id = this.id;
- if (input.value == '') {
- if (input.type == 'password') {
- if (!$input.data('placeholder-textinput')) {
- try {
- $replacement = $input.clone().attr({ 'type': 'text' });
- } catch(e) {
- $replacement = $('
', {'class': this.settings.bgClass})
.appendTo('body');
}
@@ -199,6 +212,16 @@
show : function (el, css) {
// is modal
if (css) {
+ if (el.parent('body').length === 0) {
+ var placeholder = el.wrap('
').parent();
+ el.on('closed.fndtn.reveal.wrapped', function() {
+ el.detach().appendTo(placeholder);
+ el.unwrap().unbind('closed.fndtn.reveal.wrapped');
+ });
+
+ el.detach().appendTo('body');
+ }
+
if (/pop/i.test(this.settings.animation)) {
css.top = $(window).scrollTop() - el.data('offset') + 'px';
var end_css = {
diff --git a/javascripts/foundation/foundation.section.js b/javascripts/foundation/foundation.section.js
index b622ffd..0f1e06e 100644
--- a/javascripts/foundation/foundation.section.js
+++ b/javascripts/foundation/foundation.section.js
@@ -1,27 +1,33 @@
/*jslint unparam: true, browser: true, indent: 2 */
-;(function ($, window, document, undefined) {
+;
+(function($, window, document) {
'use strict';
Foundation.libs.section = {
- name: 'section',
+ name : 'section',
- version : '4.2.2',
+ version : '4.3.2',
- settings : {
+ settings: {
deep_linking: false,
small_breakpoint: 768,
one_up: true,
- section_selector : '[data-section]',
- region_selector : 'section, .section, [data-section-region]',
- title_selector : '.title, [data-section-title]',
- active_region_selector : 'section.active, .section.active, .active[data-section-region]',
- content_selector : '.content, [data-section-content]',
- nav_selector : '[data-section="vertical-nav"], [data-section="horizontal-nav"]',
- callback: function (){}
+ multi_expand: false,
+ section_selector: '[data-section]',
+ region_selector: 'section, .section, [data-section-region]',
+ title_selector: '.title, [data-section-title]',
+ //marker: container is resized
+ resized_data_attr: 'data-section-resized',
+ //marker: container should apply accordion style
+ small_style_data_attr: 'data-section-small-style',
+ content_selector: '.content, [data-section-content]',
+ nav_selector: '[data-section="vertical-nav"], [data-section="horizontal-nav"]',
+ active_class: 'active',
+ callback: function() {}
},
- init : function (scope, method, options) {
+ init: function(scope, method, options) {
var self = this;
Foundation.inherit(this, 'throttle data_options position_right offset_right');
@@ -30,367 +36,363 @@
}
if (typeof method !== 'string') {
- this.set_active_from_hash();
this.events();
-
return true;
} else {
return this[method].call(this, options);
}
},
- events : function () {
+ events: function() {
var self = this;
- $(this.scope)
- .on('click.fndtn.section', '[data-section] .title, [data-section] [data-section-title]', function (e) {
- var $this = $(this),
- section = $this.closest(self.settings.region_selector);
+ //combine titles selector from settings for click event binding
+ var click_title_selectors = [],
+ section_selector = self.settings.section_selector,
+ region_selectors = self.settings.region_selector.split(","),
+ title_selectors = self.settings.title_selector.split(",");
+
+ for (var i = 0, len = region_selectors.length; i < len; i++) {
+ var region_selector = region_selectors[i];
+
+ for (var j = 0, len1 = title_selectors.length; j < len1; j++) {
+ var title_selector = section_selector + ">" + region_selector + ">" + title_selectors[j];
+
+ click_title_selectors.push(title_selector + " a"); //or we can not do preventDefault for click event of
+ click_title_selectors.push(title_selector);
+ }
+ }
+
+ $(self.scope)
+ .on('click.fndtn.section', click_title_selectors.join(","), function(e) {
+ var title = $(this).closest(self.settings.title_selector);
- if (section.children(self.settings.content_selector).length > 0) {
- self.toggle_active.call(this, e, self);
- self.reflow();
+ self.close_navs(title);
+ if (title.siblings(self.settings.content_selector).length > 0) {
+ self.toggle_active.call(title[0], e);
}
});
$(window)
- .on('resize.fndtn.section', self.throttle(function () {
- self.resize.call(this);
- }, 30))
- .on('hashchange', function () {
- if (!self.settings.toggled){
- self.set_active_from_hash();
- $(this).trigger('resize');
- }
- }).trigger('resize');
-
- $(document)
- .on('click.fndtn.section', function (e) {
- if ($(e.target).closest(self.settings.title_selector).length < 1) {
- $(self.settings.nav_selector)
- .children(self.settings.region_selector)
- .removeClass('active')
- .attr('style', '');
- }
- });
+ .on('resize.fndtn.section', self.throttle(function() { self.resize(); }, 30))
+ .on('hashchange.fndtn.section', self.set_active_from_hash);
+ $(document).on('click.fndtn.section', function (e) {
+ if (e.isPropagationStopped && e.isPropagationStopped()) return;
+ if (e.target === document) return;
+ self.close_navs($(e.target).closest(self.settings.title_selector));
+ });
+
+ $(window).triggerHandler('resize.fndtn.section');
+ $(window).triggerHandler('hashchange.fndtn.section');
},
+
+ //close nav !one_up on click elsewhere
+ close_navs: function(except_nav_with_title) {
+ var self = Foundation.libs.section,
+ navsToClose = $(self.settings.nav_selector)
+ .filter(function() { return !$.extend({},
+ self.settings, self.data_options($(this))).one_up; });
+
+ if (except_nav_with_title.length > 0) {
+ var section = except_nav_with_title.parent().parent();
- toggle_active : function (e, self) {
+ if (self.is_horizontal_nav(section) || self.is_vertical_nav(section)) {
+ //exclude current nav from list
+ navsToClose = navsToClose.filter(function() { return this !== section[0]; });
+ }
+ }
+ //close navs on click on title
+ navsToClose.children(self.settings.region_selector).removeClass(self.settings.active_class);
+ },
+
+ toggle_active: function(e) {
var $this = $(this),
self = Foundation.libs.section,
- region = $this.closest(self.settings.region_selector),
+ region = $this.parent(),
content = $this.siblings(self.settings.content_selector),
- parent = region.parent(),
- settings = $.extend({}, self.settings, self.data_options(parent)),
- prev_active_section = parent
- .children(self.settings.active_region_selector);
-
- self.settings.toggled = true;
+ 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]
if (!settings.deep_linking && content.length > 0) {
e.preventDefault();
}
- if (region.hasClass('active')) {
- // this is causing the style flash.
- if (self.small(parent)
- || self.is_vertical_nav(parent)
- || self.is_horizontal_nav(parent)
- || self.is_accordion(parent)) {
- if (prev_active_section[0] !== region[0]
- || (prev_active_section[0] === region[0] && !settings.one_up)) {
- region
- .removeClass('active')
- .attr('style', '');
- }
- }
- } else {
- var prev_active_section = parent
- .children(self.settings.active_region_selector),
- title_height = self.outerHeight(region
- .children(self.settings.title_selector));
-
- if (self.small(parent) || settings.one_up) {
-
- if (self.small(parent)) {
- prev_active_section.attr('style', '');
- } else {
- prev_active_section.attr('style',
- 'visibility: hidden; padding-top: '+title_height+'px;');
- }
- }
-
- if (self.small(parent)) {
- region.attr('style', '');
- } else {
- region.css('padding-top', title_height);
- }
-
- region.addClass('active');
+ e.stopPropagation(); //do not catch same click again on parent
- if (prev_active_section.length > 0) {
- prev_active_section
- .removeClass('active')
- .attr('style', '');
- }
-
- // Toggle the content display attribute. This is done to
- // ensure accurate outerWidth measurements that account for
- // the scrollbar.
- if (self.is_vertical_tabs(parent)) {
- content.css('display', 'block');
-
- if (prev_active_section !== null) {
- prev_active_section
- .children(self.settings.content_selector)
- .css('display', 'none');
- }
+ if (!region.hasClass(self.settings.active_class)) {
+ if (!self.is_accordion(section) || (self.is_accordion(section) && !self.settings.multi_expand)) {
+ prev_active_region.removeClass(self.settings.active_class);
+ prev_active_region.trigger('closed.fndtn.section');
}
+ 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);
+ region.trigger('opened.fndtn.section');
+ } else if (region.hasClass(self.settings.active_class) && self.is_accordion(section) || !settings.one_up && (self.small(section) || self.is_vertical_nav(section) || self.is_horizontal_nav(section) || self.is_accordion(section))) {
+ region.removeClass(self.settings.active_class);
+ region.trigger('closed.fndtn.section');
}
+ settings.callback(section);
+ },
- setTimeout(function () {
- self.settings.toggled = false;
- }, 300);
+ check_resize_timer: null,
- settings.callback();
- },
+ //main function that sets title and content positions; runs for :not(.resized) and :visible once when window width is medium up
+ //sections:
+ // selected sections to resize, are defined on resize forced by visibility changes
+ //ensure_has_active_region:
+ // is true when we force resize for no resized sections that were hidden and became visible,
+ // these sections can have no selected region, because all regions were hidden along with section on executing set_active_from_hash
+ resize: function(sections, ensure_has_active_region) {
- resize : function () {
var self = Foundation.libs.section,
- sections = $(self.settings.section_selector);
+ section_container = $(self.settings.section_selector),
+ is_small_window = self.small(section_container),
+ //filter for section resize
+ should_be_resized = function (section, now_is_hidden) {
+ return !self.is_accordion(section) &&
+ !section.is("[" + self.settings.resized_data_attr + "]") &&
+ (!is_small_window || self.is_horizontal_tabs(section)) &&
+ now_is_hidden === (section.css('display') === 'none' ||
+ !section.parent().is(':visible'));
+ };
+
+ sections = sections || $(self.settings.section_selector);
+
+ clearTimeout(self.check_resize_timer);
+
+ if (!is_small_window) {
+ sections.removeAttr(self.settings.small_style_data_attr);
+ }
- sections.each(function() {
- var $this = $(this),
- active_section = $this
- .children(self.settings.active_region_selector),
- settings = $.extend({}, self.settings, self.data_options($this));
-
- if (active_section.length > 1) {
- active_section
- .not(':first')
- .removeClass('active')
- .attr('style', '');
- } else if (active_section.length < 1
- && !self.is_vertical_nav($this)
- && !self.is_horizontal_nav($this)
- && !self.is_accordion($this)) {
-
- var first = $this.children(self.settings.region_selector).first();
-
- if (settings.one_up || !self.small($this)) {
- first.addClass('active');
+ //resize
+ sections.filter(function() { return should_be_resized($(this), false); })
+ .each(function() {
+ var section = $(this),
+ regions = section.children(self.settings.region_selector),
+ titles = regions.children(self.settings.title_selector),
+ content = regions.children(self.settings.content_selector),
+ titles_max_height = 0;
+
+ if (ensure_has_active_region &&
+ section.children(self.settings.region_selector).filter("." + self.settings.active_class).length == 0) {
+ var settings = $.extend({}, self.settings, self.data_options(section));
+
+ if (!settings.deep_linking && (settings.one_up || !self.is_horizontal_nav(section) &&
+ !self.is_vertical_nav(section) && !self.is_accordion(section))) {
+ regions.filter(":visible").first().addClass(self.settings.active_class);
+ }
}
- if (self.small($this)) {
- first.attr('style', '');
- } else {
- first.css('padding-top', self.outerHeight(first
- .children(self.settings.title_selector)));
- }
- }
+ if (self.is_horizontal_tabs(section) || self.is_auto(section)) {
+ // region: position relative
+ // title: position absolute
+ // content: position static
+ var titles_sum_width = 0;
- if (self.small($this)) {
- active_section.attr('style', '');
- } else {
- active_section.css('padding-top', self.outerHeight(active_section
- .children(self.settings.title_selector)));
- }
+ titles.each(function() {
+ var title = $(this);
- self.position_titles($this);
+ if (title.is(":visible")) {
+ title.css(!self.rtl ? 'left' : 'right', titles_sum_width);
+ var title_h_border_width = parseInt(title.css("border-" + (self.rtl ? 'left' : 'right') + "-width"), 10);
- if ( (self.is_horizontal_nav($this) && !self.small($this))
- || self.is_vertical_tabs($this) && !self.small($this)) {
- self.position_content($this);
- } else {
- self.position_content($this, false);
- }
- });
- },
+ if (title_h_border_width.toString() === 'Nan') {
+ title_h_border_width = 0;
+ }
- is_vertical_nav : function (el) {
- return /vertical-nav/i.test(el.data('section'));
- },
+ titles_sum_width += self.outerWidth(title) - title_h_border_width;
+ titles_max_height = Math.max(titles_max_height, self.outerHeight(title));
+ }
+ });
+ titles.css('height', titles_max_height);
+ regions.each(function() {
+ var region = $(this),
+ region_content = region.children(self.settings.content_selector),
+ content_top_border_width = parseInt(region_content.css("border-top-width"), 10);
- is_horizontal_nav : function (el) {
- return /horizontal-nav/i.test(el.data('section'));
- },
+ if (content_top_border_width.toString() === 'Nan') {
+ content_top_border_width = 0;
+ }
- is_accordion : function (el) {
- return /accordion/i.test(el.data('section'));
- },
+ region.css('padding-top', titles_max_height - content_top_border_width);
+ });
- is_horizontal_tabs : function (el) {
- return /^tabs$/i.test(el.data('section'));
- },
+ section.css("min-height", titles_max_height);
+ } else if (self.is_horizontal_nav(section)) {
+ var first = true;
+ // region: positon relative, float left
+ // title: position static
+ // content: position absolute
+ titles.each(function() {
+ titles_max_height = Math.max(titles_max_height, self.outerHeight($(this)));
+ });
- is_vertical_tabs : function (el) {
- return /vertical-tabs/i.test(el.data('section'));
- },
+ regions.each(function() {
+ var region = $(this);
- set_active_from_hash : function () {
- var hash = window.location.hash.substring(1),
- sections = $('[data-section]'),
- self = this;
- sections.each(function () {
- var section = $(this),
- settings = $.extend({}, self.settings, self.data_options(section));
-
- if (hash.length > 0 && settings.deep_linking) {
- var regions = section
- .children(self.settings.region_selector)
- .attr('style', '')
- .removeClass('active');
-
- var hash_regions = regions.map(function () {
- var content = $(self.settings.content_selector, this),
- content_slug = content.data('slug');
-
- if (new RegExp(content_slug, 'i').test(hash))
- return content;
+ region.css("margin-left", "-" + (first ? section : region.children(self.settings.title_selector)).css("border-left-width"));
+ first = false;
});
+ regions.css("margin-top", "-" + section.css("border-top-width"));
+ titles.css('height', titles_max_height);
+ content.css('top', titles_max_height);
+ section.css("min-height", titles_max_height);
+ } else if (self.is_vertical_tabs(section)) {
+ var titles_sum_height = 0;
+ // region: position relative, for .active: fixed padding==title.width
+ // title: fixed width, position absolute
+ // content: position static
+ titles.each(function() {
+ var title = $(this);
+
+ if (title.is(":visible")) {
+ title.css('top', titles_sum_height);
+ var title_top_border_width = parseInt(title.css("border-top-width"), 10);
+
+ if (title_top_border_width.toString() === 'Nan') {
+ title_top_border_width = 0;
+ }
+
+ titles_sum_height += self.outerHeight(title) - title_top_border_width;
+ }
+ });
- var count = hash_regions.length;
-
- for (var i = count - 1; i >= 0; i--) {
- $(hash_regions[i]).parent().addClass('active');
- }
- }
- });
- },
+ content.css('min-height', titles_sum_height + 1);
+ } else if (self.is_vertical_nav(section)) {
+ var titles_max_width = 0,
+ first1 = true;
+ // region: positon relative
+ // title: position static
+ // content: position absolute
+ titles.each(function() {
+ titles_max_width = Math.max(titles_max_width, self.outerWidth($(this)));
+ });
- position_titles : function (section, off) {
- var self = this,
- titles = section
- .children(this.settings.region_selector)
- .map(function () {
- return $(this).children(self.settings.title_selector);
- }),
- previous_width = 0,
- previous_height = 0,
- self = this;
+ regions.each(function () {
+ var region = $(this);
- if (typeof off === 'boolean') {
- titles.attr('style', '');
+ region.css("margin-top", "-" + (first1 ? section : region.children(self.settings.title_selector)).css("border-top-width"));
+ first1 = false;
+ });
- } else {
- titles.each(function () {
- if (self.is_vertical_tabs(section)) {
- $(this).css('top', previous_height);
- previous_height += self.outerHeight($(this));
- } else {
- if (!self.rtl) {
- $(this).css('left', previous_width);
- } else {
- $(this).css('right', previous_width);
- }
- previous_width += self.outerWidth($(this));
+ titles.css('width', titles_max_width);
+ content.css(!self.rtl ? 'left' : 'right', titles_max_width);
+ section.css('width', titles_max_width);
}
- });
- }
- },
- position_content : function (section, off) {
- var self = this,
- regions = section.children(self.settings.region_selector),
- titles = regions
- .map(function () {
- return $(this).children(self.settings.title_selector);
- }),
- content = regions
- .map(function () {
- return $(this).children(self.settings.content_selector);
- });
+ section.attr(self.settings.resized_data_attr, true);
+ });
- if (typeof off === 'boolean') {
- content.attr('style', '');
- section.attr('style', '');
- } else {
- if (self.is_vertical_tabs(section)
- && !self.small(section)) {
- var content_min_height = 0,
- content_min_width = Number.MAX_VALUE,
- title_width = null;
+ //wait elements to become visible then resize
+ if ($(self.settings.section_selector).filter(function() { return should_be_resized($(this), true); }).length > 0)
+ self.check_resize_timer = setTimeout(function() {
+ self.resize(sections.filter(function() { return should_be_resized($(this), false); }), true);
+ }, 700);
- regions.each(function () {
- var region = $(this),
- title = region.children(self.settings.title_selector),
- content = region.children(self.settings.content_selector),
- content_width = 0;
+ if (is_small_window) {
+ sections.attr(self.settings.small_style_data_attr, true);
+ }
+ },
- title_width = self.outerWidth(title);
- content_width = self.outerWidth(section) - title_width;
+ is_vertical_nav: function(el) {
+ return /vertical-nav/i.test(el.data('section'));
+ },
- if (content_width < content_min_width) {
- content_min_width = content_width;
- }
+ is_horizontal_nav: function(el) {
+ return /horizontal-nav/i.test(el.data('section'));
+ },
- // Increment the minimum height of the content region
- // to align with the height of the titles.
- content_min_height += self.outerHeight(title);
+ is_accordion: function(el) {
+ return /accordion/i.test(el.data('section'));
+ },
- // Set all of the inactive tabs to 'display: none'
- // The CSS sets all of the tabs as 'display: block'
- // in order to account for scrollbars when measuring the width
- // of the content regions.
- if (!$(this).hasClass('active')) {
- content.css('display', 'none');
- }
- });
+ is_horizontal_tabs: function(el) {
+ return /^tabs$/i.test(el.data('section'));
+ },
- regions.each(function () {
- var content = $(this).children(self.settings.content_selector);
- content.css('minHeight', content_min_height);
+ is_vertical_tabs: function(el) {
+ return /vertical-tabs/i.test(el.data('section'));
+ },
+
+ is_auto: function (el) {
+ var data_section = el.data('section');
+ return data_section === '' || /auto/i.test(data_section);
+ },
- // Remove 2 pixels to account for the right-shift in the CSS
- content.css('maxWidth', content_min_width - 2);
- });
+ set_active_from_hash: function() {
+ var self = Foundation.libs.section,
+ hash = window.location.hash.substring(1),
+ sections = $(self.settings.section_selector);
- } else {
- regions.each(function () {
+ var selectedSection;
+
+ sections.each(function() {
+ var section = $(this),
+ regions = section.children(self.settings.region_selector);
+ regions.each(function() {
var region = $(this),
- title = region.children(self.settings.title_selector),
- content = region.children(self.settings.content_selector);
- if (!self.rtl) {
- content
- .css({left: title.position().left - 1,
- top: self.outerHeight(title) - 2});
- } else {
- content
- .css({right: self.position_right(title) + 1,
- top: self.outerHeight(title) - 2});
- }
+ data_slug = region.children(self.settings.content_selector).data('slug');
+ if (new RegExp(data_slug, 'i').test(hash)) {
+ selectedSection=section;
+ return false;
+ }
});
-
- // temporary work around for Zepto outerheight calculation issues.
- if (typeof Zepto === 'function') {
- section.height(this.outerHeight($(titles[0])));
- } else {
- section.height(this.outerHeight($(titles[0])) - 2);
+
+ if (selectedSection != null) {
+ return false;
}
- }
+ });
+
+ if (selectedSection != null) {
+ sections.each(function() {
+ if (selectedSection == $(this)) {
+ var section = $(this),
+ settings = $.extend({}, self.settings, self.data_options(section)),
+ regions = section.children(self.settings.region_selector),
+ set_active_from_hash = settings.deep_linking && hash.length > 0,
+ selected = false;
+
+ regions.each(function() {
+ var region = $(this);
+
+ if (selected) {
+ region.removeClass(self.settings.active_class);
+ } else if (set_active_from_hash) {
+ var data_slug = region.children(self.settings.content_selector).data('slug');
+
+ if (data_slug && new RegExp(data_slug, 'i').test(hash)) {
+ if (!region.hasClass(self.settings.active_class))
+ region.addClass(self.settings.active_class);
+ selected = true;
+ } else {
+ region.removeClass(self.settings.active_class);
+ }
+ } else if (region.hasClass(self.settings.active_class)) {
+ selected = true;
+ }
+ });
+
+ if (!selected && (settings.one_up || !self.is_horizontal_nav(section) &&
+ !self.is_vertical_nav(section) && !self.is_accordion(section)))
+ regions.filter(":visible").first().addClass(self.settings.active_class);
+ }
+ });
}
},
- position_right : function (el) {
- var self = this,
- section = el.closest(this.settings.section_selector),
- regions = section.children(this.settings.region_selector),
- section_width = el.closest(this.settings.section_selector).width(),
- offset = regions
- .map(function () {
- return $(this).children(self.settings.title_selector);
- }).length;
- return (section_width - el.position().left - el.width() * (el.index() + 1) - offset);
- },
+ reflow: function() {
+ var self = Foundation.libs.section;
- reflow : function (scope) {
- var scope = scope || document;
- $(this.settings.section_selector, scope).trigger('resize');
+ $(self.settings.section_selector).removeAttr(self.settings.resized_data_attr);
+ self.throttle(function() { self.resize(); }, 30)();
},
- small : function (el) {
+ small: function(el) {
var settings = $.extend({}, this.settings, this.data_options(el));
if (this.is_horizontal_tabs(el)) {
@@ -408,10 +410,21 @@
return $(this.scope).width() < settings.small_breakpoint;
},
- off : function () {
+ off: function() {
$(this.scope).off('.fndtn.section');
$(window).off('.fndtn.section');
- $(document).off('.fndtn.section')
+ $(document).off('.fndtn.section');
}
};
-}(Foundation.zj, this, this.document));
+
+ //resize selected sections
+ $.fn.reflow_section = function(ensure_has_active_region) {
+ var section = this,
+ self = Foundation.libs.section;
+
+ section.removeAttr(self.settings.resized_data_attr);
+ self.throttle(function() { self.resize(section, ensure_has_active_region); }, 30)();
+ return this;
+ };
+
+}(Foundation.zj, window, document));
diff --git a/javascripts/foundation/foundation.tooltips.js b/javascripts/foundation/foundation.tooltips.js
index bb5d4ac..dba69ca 100644
--- a/javascripts/foundation/foundation.tooltips.js
+++ b/javascripts/foundation/foundation.tooltips.js
@@ -4,14 +4,15 @@
'use strict';
Foundation.libs.tooltips = {
- name: 'tooltips',
+ name : 'tooltips',
- version : '4.2.2',
+ version : '4.3.2',
settings : {
selector : '.has-tip',
additionalInheritableClasses : [],
tooltipClass : '.tooltip',
+ touchCloseText: 'tap to close',
appendTo: 'body',
'disable-for-touch': false,
tipTemplate : function (selector, content) {
@@ -110,7 +111,7 @@
$tip.addClass(classes).appendTo(this.settings.appendTo);
if (Modernizr.touch) {
- $tip.append('tap to close ');
+ $tip.append(''+this.settings.touchCloseText+' ');
}
$target.removeAttr('title').attr('title','');
this.show($target);
@@ -205,4 +206,4 @@
reflow : function () {}
};
-}(Foundation.zj, this, this.document));
+}(Foundation.zj, this, this.document));
\ No newline at end of file
diff --git a/javascripts/foundation/foundation.topbar.js b/javascripts/foundation/foundation.topbar.js
index 4486431..5cb2d6c 100644
--- a/javascripts/foundation/foundation.topbar.js
+++ b/javascripts/foundation/foundation.topbar.js
@@ -6,7 +6,7 @@
Foundation.libs.topbar = {
name : 'topbar',
- version : '4.2.2',
+ version: '4.3.2',
settings : {
index : 0,
@@ -14,12 +14,13 @@
custom_back_text: true,
back_text: 'Back',
is_hover: true,
+ mobile_show_parent_link: false,
scrolltop : true, // jump to top when sticky nav menu toggle is clicked
init : false
},
init : function (section, method, options) {
- Foundation.inherit(this, 'data_options');
+ Foundation.inherit(this, 'data_options addCustomRule');
var self = this;
if (typeof method === 'object') {
@@ -38,14 +39,29 @@
self.settings.$titlebar = self.settings.$topbar.children('ul').first();
self.settings.$topbar.data('index', 0);
+ var topbarContainer = self.settings.$topbar.parent();
+ if(topbarContainer.hasClass('fixed') || topbarContainer.hasClass(self.settings.stickyClass)) {
+ self.settings.$topbar.data('height', self.outerHeight(topbarContainer));
+ self.settings.$topbar.data('stickyoffset', topbarContainer.offset().top);
+ } else {
+ self.settings.$topbar.data('height', self.outerHeight(self.settings.$topbar));
+ }
+
var breakpoint = $("
").insertAfter(self.settings.$topbar);
self.settings.breakPoint = breakpoint.width();
breakpoint.remove();
self.assemble();
+ if (self.settings.is_hover) {
+ self.settings.$topbar.find('.has-dropdown').addClass('not-click');
+ }
+
+ // Pad body when sticky (scrolled) or fixed.
+ self.addCustomRule('.f-topbar-fixed { padding-top: ' + self.settings.$topbar.data('height') + 'px }');
+
if (self.settings.$topbar.parent().hasClass('fixed')) {
- $('body').css('padding-top', self.outerHeight(self.settings.$topbar));
+ $('body').addClass('f-topbar-fixed');
}
});
@@ -60,70 +76,88 @@
}
},
- events : function () {
+ toggle: function() {
var self = this;
- var offst = this.outerHeight($('.top-bar, [data-topbar]'));
- $(this.scope)
- .off('.fndtn.topbar')
- .on('click.fndtn.topbar', '.top-bar .toggle-topbar, [data-topbar] .toggle-topbar', function (e) {
- var topbar = $(this).closest('.top-bar, [data-topbar]'),
- section = topbar.find('section, .section'),
- titlebar = topbar.children('ul').first();
+ var topbar = $('.top-bar, [data-topbar]'),
+ section = topbar.find('section, .section');
- e.preventDefault();
+ if (self.breakpoint()) {
+ if (!self.rtl) {
+ section.css({left: '0%'});
+ section.find('>.name').css({left: '100%'});
+ } else {
+ section.css({right: '0%'});
+ section.find('>.name').css({right: '100%'});
+ }
- if (self.breakpoint()) {
- if (!self.rtl) {
- section.css({left: '0%'});
- section.find('>.name').css({left: '100%'});
- } else {
- section.css({right: '0%'});
- section.find('>.name').css({right: '100%'});
- }
+ section.find('li.moved').removeClass('moved');
+ topbar.data('index', 0);
- section.find('li.moved').removeClass('moved');
- topbar.data('index', 0);
+ topbar
+ .toggleClass('expanded')
+ .css('height', '');
+ }
- topbar
- .toggleClass('expanded')
- .css('max-height', '');
+ if(self.settings.scrolltop)
+ {
+ if (!topbar.hasClass('expanded')) {
+ if (topbar.hasClass('fixed')) {
+ topbar.parent().addClass('fixed');
+ topbar.removeClass('fixed');
+ $('body').addClass('f-topbar-fixed');
}
-
- if (!topbar.hasClass('expanded')) {
- if (topbar.hasClass('fixed')) {
- topbar.parent().addClass('fixed');
- topbar.removeClass('fixed');
- $('body').css('padding-top',offst);
- }
- } else if (topbar.parent().hasClass('fixed')) {
+ } else if (topbar.parent().hasClass('fixed')) {
+ if (self.settings.scrolltop) {
topbar.parent().removeClass('fixed');
topbar.addClass('fixed');
- $('body').css('padding-top','0');
+ $('body').removeClass('f-topbar-fixed');
- if (self.settings.scrolltop) {
- window.scrollTo(0,0);
- }
+ window.scrollTo(0,0);
+ } else {
+ topbar.parent().removeClass('expanded');
}
- })
-
- .on('mouseenter mouseleave', '.top-bar li', function (e) {
- if (!self.settings.is_hover) return;
+ }
+ } else {
+ if(topbar.parent().hasClass(self.settings.stickyClass)) {
+ topbar.parent().addClass('fixed');
+ }
- if (/enter|over/i.test(e.type)) {
- $(this).addClass('hover');
+ if(topbar.parent().hasClass('fixed')) {
+ if (!topbar.hasClass('expanded')) {
+ topbar.removeClass('fixed');
+ topbar.parent().removeClass('expanded');
+ self.updateStickyPositioning();
} else {
- $(this).removeClass('hover');
+ topbar.addClass('fixed');
+ topbar.parent().addClass('expanded');
}
+ }
+ }
+ },
+
+ timer : null,
+
+ events : function () {
+ var self = this;
+ $(this.scope)
+ .off('.fndtn.topbar')
+ .on('click.fndtn.topbar', '.top-bar .toggle-topbar, [data-topbar] .toggle-topbar', function (e) {
+ e.preventDefault();
+ self.toggle();
})
.on('click.fndtn.topbar', '.top-bar li.has-dropdown', function (e) {
- if (self.breakpoint()) return;
-
var li = $(this),
target = $(e.target),
topbar = li.closest('[data-topbar], .top-bar'),
is_hover = topbar.data('topbar');
+ if(target.data('revealId')) {
+ self.toggle();
+ return;
+ }
+
+ if (self.breakpoint()) return;
if (self.settings.is_hover && !Modernizr.touch) return;
e.stopImmediatePropagation();
@@ -137,19 +171,22 @@
.removeClass('hover')
.find('li')
.removeClass('hover');
+
+ li.parents('li.hover')
+ .removeClass('hover');
} else {
li.addClass('hover');
}
})
.on('click.fndtn.topbar', '.top-bar .has-dropdown>a, [data-topbar] .has-dropdown>a', function (e) {
- if (self.breakpoint()) {
+ if (self.breakpoint() && $(window).width() != self.settings.breakPoint) {
+
e.preventDefault();
var $this = $(this),
topbar = $this.closest('.top-bar, [data-topbar]'),
section = topbar.find('section, .section'),
- titlebar = topbar.children('ul').first(),
dropdownHeight = $this.next('.dropdown').outerHeight(),
$selectedLi = $this.closest('li');
@@ -164,22 +201,49 @@
section.find('>.name').css({right: 100 * topbar.data('index') + '%'});
}
- topbar.css('max-height', self.height($this.siblings('ul')) + self.outerHeight(titlebar, true));
+ topbar.css('height', self.outerHeight($this.siblings('ul'), true) + self.settings.$topbar.data('height'));
}
});
$(window).on('resize.fndtn.topbar', function () {
+ if (typeof self.settings.$topbar === 'undefined') { return; }
+ var stickyContainer = self.settings.$topbar.parent('.' + this.settings.stickyClass);
+ var stickyOffset;
+
if (!self.breakpoint()) {
+ var doToggle = self.settings.$topbar.hasClass('expanded');
$('.top-bar, [data-topbar]')
- .css('max-height', '')
+ .css('height', '')
.removeClass('expanded')
.find('li')
.removeClass('hover');
+
+ if(doToggle) {
+ self.toggle();
+ }
+ }
+
+ if(stickyContainer.length > 0) {
+ if(stickyContainer.hasClass('fixed')) {
+ // Remove the fixed to allow for correct calculation of the offset.
+ stickyContainer.removeClass('fixed');
+
+ stickyOffset = stickyContainer.offset().top;
+ if($(document.body).hasClass('f-topbar-fixed')) {
+ stickyOffset -= self.settings.$topbar.data('height');
+ }
+
+ self.settings.$topbar.data('stickyoffset', stickyOffset);
+ stickyContainer.addClass('fixed');
+ } else {
+ stickyOffset = stickyContainer.offset().top;
+ self.settings.$topbar.data('stickyoffset', stickyOffset);
+ }
}
}.bind(this));
$('body').on('click.fndtn.topbar', function (e) {
- var parent = $(e.target).closest('[data-topbar], .top-bar');
+ var parent = $(e.target).closest('li').closest('li.hover');
if (parent.length > 0) {
return;
@@ -194,7 +258,6 @@
var $this = $(this),
topbar = $this.closest('.top-bar, [data-topbar]'),
- titlebar = topbar.children('ul').first(),
section = topbar.find('section, .section'),
$movedLi = $this.closest('li.moved'),
$previousLevelUl = $movedLi.parent();
@@ -210,9 +273,9 @@
}
if (topbar.data('index') === 0) {
- topbar.css('max-height', '');
+ topbar.css('height', '');
} else {
- topbar.css('max-height', self.height($previousLevelUl) + self.outerHeight(titlebar, true));
+ topbar.css('height', self.outerHeight($previousLevelUl, true) + self.settings.$topbar.data('height'));
}
setTimeout(function () {
@@ -235,7 +298,7 @@
$dropdown = $link.siblings('.dropdown'),
url = $link.attr('href');
- if (url && url.length > 1) {
+ if (self.settings.mobile_show_parent_link && url && url.length > 1) {
var $titleLi = $('' + $link.text() +' 
Edirom-Summer-School 2014
.
@@ -85,7 +88,7 @@ 
+ 