Skip to content

Commit

Permalink
# add new version of mediaelements 2.14.0 and foundation framework 5.4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
MoniqueHahnefeld committed Oct 24, 2014
1 parent df391ee commit 5d7773e
Show file tree
Hide file tree
Showing 215 changed files with 31,247 additions and 6,641 deletions.
16 changes: 8 additions & 8 deletions core/system/modules/foundation-to-contao/README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
#FTC

Version 1.1.0 - RC2
##Requirements

- Contao 3.3.
- Contao 3.3.0
- MulticolumWizard
- Foundation 5 von Zurb

##Vendor
- Foundation 5.4.6 von Zurb
- jQuery
- Mediaelements 2.14.0


##Documentation
##Documentation & Introduction

http://www.foundation-to-contao.de


##Introduction
http://www.new.foundation-to-contao.de

##Tutorials

https://designs2.de
Expand Down Expand Up @@ -58,7 +58,7 @@ http://zurb.com/playground/foundation4-stencil-sets
### Mansonry Plugin
http://patterntap.com/code/stacking-columns-layout-masonry

### settings fpr contao
### settings for contao
Artikel f
Nachrichten
Events
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Foundation was made by ZURB, an interaction design and design strategy firm in Campbell, CA */
/* zurb.com */
/* zurb.com */
/* humanstxt.org */

/* SITE */
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Foundation.libs.abide = {
name : 'abide',

version : '5.3.3',
version : '{{VERSION}}',

settings : {
live_validate : true,
Expand All @@ -22,7 +22,7 @@
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])?)*$/,
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
Expand All @@ -36,6 +36,8 @@
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])[- \/.]\d{4}$/,
// DD/MM/YYYY
day_month_year : /^(0[1-9]|[12][0-9]|3[01])[- \/.](0[1-9]|1[012])[- \/.]\d{4}$/,

// #FFF or #FFFFFF
color: /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/
Expand Down Expand Up @@ -167,7 +169,8 @@
is_radio = el.type === "radio",
is_checkbox = el.type === "checkbox",
label = this.S('label[for="' + el.getAttribute('id') + '"]'),
valid_length = (required) ? (el.value.length > 0) : true;
valid_length = (required) ? (el.value.length > 0) : true,
el_validations = [];

var parent, valid;

Expand All @@ -180,41 +183,55 @@
parent = direct_parent.parent();
}

if (validator) {
valid = this.settings.validators[validator].apply(this, [el, required, parent]);
el_validations.push(valid);
}

if (is_radio && required) {
validations.push(this.valid_radio(el, required));
el_validations.push(this.valid_radio(el, required));
} else if (is_checkbox && required) {
validations.push(this.valid_checkbox(el, required));
el_validations.push(this.valid_checkbox(el, required));
} else {

if (validator) {
valid = this.settings.validators[validator].apply(this, [el, required, parent]);
validations.push(valid);
}

if (el_patterns[i][1].test(value) && valid_length ||
!required && el.value.length < 1 || $(el).attr('disabled')) {
validations.push(true);
el_validations.push(true);
} else {
validations.push(false);
el_validations.push(false);
}

validations = [validations.every(function(valid){return valid;})];
el_validations = [el_validations.every(function(valid){return valid;})];

if(validations[0]){
if(el_validations[0]){
this.S(el).removeAttr(this.invalid_attr);
el.setAttribute('aria-invalid', 'false');
el.removeAttribute('aria-describedby');
parent.removeClass('error');
if (label.length > 0 && this.settings.error_labels) label.removeClass('error');
if (label.length > 0 && this.settings.error_labels) {
label.removeClass('error').removeAttr('role');
}
$(el).triggerHandler('valid');
} else {
parent.addClass('error');
this.S(el).attr(this.invalid_attr, '');
if (label.length > 0 && this.settings.error_labels) label.addClass('error');
el.setAttribute('aria-invalid', 'true');

// Try to find the error associated with the input
var errorElem = parent.find('small.error, span.error');
var errorID = errorElem.length > 0 ? errorElem[0].id : "";
if (errorID.length > 0) el.setAttribute('aria-describedby', errorID);

// el.setAttribute('aria-describedby', $(el).find('.error')[0].id);
parent.addClass('error');
if (label.length > 0 && this.settings.error_labels) {
label.addClass('error').attr('role', 'alert');
}
$(el).triggerHandler('invalid');
}

}
validations.push(el_validations[0]);
}

validations = [validations.every(function(valid){return valid;})];
return validations;
},

Expand Down Expand Up @@ -262,9 +279,11 @@
if (valid) {
this.S(el).removeAttr(this.invalid_attr);
parent.removeClass('error');
if (label.length > 0 && settings.error_labels) label.removeClass('error');
} else {
this.S(el).attr(this.invalid_attr, '');
parent.addClass('error');
if (label.length > 0 && settings.error_labels) label.addClass('error');
}

return valid;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Foundation.libs.accordion = {
name : 'accordion',

version : '5.3.3',
version : '{{VERSION}}',

settings : {
active_class: 'active',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Foundation.libs.alert = {
name : 'alert',

version : '5.3.3',
version : '{{VERSION}}',

settings : {
callback: function (){}
Expand All @@ -18,7 +18,7 @@
var self = this,
S = this.S;

$(this.scope).off('.alert').on('click.fndtn.alert', '[' + this.attr_name() + '] a.close', function (e) {
$(this.scope).off('.alert').on('click.fndtn.alert', '[' + this.attr_name() + '] .close', function (e) {
var alertBox = S(this).closest('[' + self.attr_name() + ']'),
settings = alertBox.data(self.attr_name(true) + '-init') || self.settings;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Foundation.libs.clearing = {
name : 'clearing',

version: '5.3.3',
version: '{{VERSION}}',

settings : {
templates : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
Foundation.libs.dropdown = {
name : 'dropdown',

version : '5.3.3',
version : '{{VERSION}}',

settings : {
active_class: 'open',
disabled_class: 'disabled',
mega_class: 'mega',
align: 'bottom',
is_hover: false,
opened: function(){},
Expand Down Expand Up @@ -49,11 +51,11 @@
}

var settings = target.data(self.attr_name(true) + '-init') || self.settings;

if(S(e.target).data(self.data_attr()) && settings.is_hover) {
self.closeall.call(self);
}

if (settings.is_hover) self.open.apply(self, [dropdown, target]);
})
.on('mouseleave.fndtn.dropdown', '[' + this.attr_name() + '], [' + this.attr_name() + '-content]', function (e) {
Expand All @@ -63,7 +65,7 @@
var settings = $this.data(self.data_attr(true) + '-init') || self.settings;
if (settings.is_hover) self.close.call(self, S('#' + $this.data(self.data_attr())));
} else {
var target = S('[' + self.attr_name() + '="' + S(this).attr('id') + '"]'),
var target = S('[' + self.attr_name() + '="' + S(this).attr('id') + '"]'),
settings = target.data(self.attr_name(true) + '-init') || self.settings;
if (settings.is_hover) self.close.call(self, $this);
}
Expand All @@ -75,8 +77,8 @@
if (S(e.target).closest('[' + self.attr_name() + ']').length > 0) {
return;
}
if (!(S(e.target).data('revealId')) &&
(parent.length > 0 && (S(e.target).is('[' + self.attr_name() + '-content]') ||
if (!(S(e.target).data('revealId')) &&
(parent.length > 0 && (S(e.target).is('[' + self.attr_name() + '-content]') ||
$.contains(parent.first()[0], e.target)))) {
e.stopPropagation();
return;
Expand All @@ -103,9 +105,12 @@
close: function (dropdown) {
var self = this;
dropdown.each(function () {
var original_target = $('[' + self.attr_name() + '=' + dropdown[0].id + ']') || $('aria-controls=' + dropdown[0].id+ ']');
original_target.attr('aria-expanded', "false");
if (self.S(this).hasClass(self.settings.active_class)) {
self.S(this)
.css(Foundation.rtl ? 'right':'left', '-99999px')
.attr('aria-hidden', "true")
.removeClass(self.settings.active_class)
.prev('[' + self.attr_name() + ']')
.removeClass(self.settings.active_class)
Expand All @@ -119,7 +124,7 @@
closeall: function() {
var self = this;
$.each(self.S('[' + this.attr_name() + '-content]'), function() {
self.close.call(self, self.S(this))
self.close.call(self, self.S(this));
});
},

Expand All @@ -129,6 +134,9 @@
.addClass(this.settings.active_class), target);
dropdown.prev('[' + this.attr_name() + ']').addClass(this.settings.active_class);
dropdown.data('target', target.get(0)).trigger('opened').trigger('opened.fndtn.dropdown', [dropdown, target]);
dropdown.attr('aria-hidden', 'false');
target.attr('aria-expanded', 'true');
dropdown.focus();
},

data_attr: function () {
Expand All @@ -140,6 +148,9 @@
},

toggle : function (target) {
if (target.hasClass(this.settings.disabled_class)) {
return;
}
var dropdown = this.S('#' + target.data(this.data_attr()));
if (dropdown.length === 0) {
// No dropdown found, not continuing
Expand Down Expand Up @@ -167,12 +178,13 @@
},

css : function (dropdown, target) {
var left_offset = Math.max((target.width() - dropdown.width()) / 2, 8);

var left_offset = Math.max((target.width() - dropdown.width()) / 2, 8),
settings = target.data(this.attr_name(true) + '-init') || this.settings;

this.clear_idx();

if (this.small()) {
var p = this.dirs.bottom.call(dropdown, target);
var p = this.dirs.bottom.call(dropdown, target, settings);

dropdown.attr('style', '').removeClass('drop-left drop-right drop-top').css({
position : 'absolute',
Expand All @@ -183,7 +195,6 @@

dropdown.css(Foundation.rtl ? 'right':'left', left_offset);
} else {
var settings = target.data(this.attr_name(true) + '-init') || this.settings;

this.style(dropdown, target, settings);
}
Expand All @@ -192,7 +203,7 @@
},

style : function (dropdown, target, settings) {
var css = $.extend({position: 'absolute'},
var css = $.extend({position: 'absolute'},
this.dirs[settings.align].call(dropdown, target, settings));

dropdown.attr('style', '').css(css);
Expand All @@ -214,29 +225,27 @@
},
top: function (t, s) {
var self = Foundation.libs.dropdown,
p = self.dirs._base.call(this, t),
pip_offset_base = 8;
p = self.dirs._base.call(this, t);

this.addClass('drop-top');

if (t.outerWidth() < this.outerWidth() || self.small()) {
self.adjust_pip(pip_offset_base, p);
if (t.outerWidth() < this.outerWidth() || self.small() || this.hasClass(s.mega_menu)) {
self.adjust_pip(this,t,s,p);
}

if (Foundation.rtl) {
return {left: p.left - this.outerWidth() + t.outerWidth(),
return {left: p.left - this.outerWidth() + t.outerWidth(),
top: p.top - this.outerHeight()};
}

return {left: p.left, top: p.top - this.outerHeight()};
},
bottom: function (t, s) {
bottom: function (t,s) {
var self = Foundation.libs.dropdown,
p = self.dirs._base.call(this, t),
pip_offset_base = 8;
p = self.dirs._base.call(this, t);

if (t.outerWidth() < this.outerWidth() || self.small()) {
self.adjust_pip(pip_offset_base, p);
if (t.outerWidth() < this.outerWidth() || self.small() || this.hasClass(s.mega_menu)) {
self.adjust_pip(this,t,s,p);
}

if (self.rtl) {
Expand All @@ -262,11 +271,15 @@
},

// Insert rule to style psuedo elements
adjust_pip : function (pip_offset_base, p) {
var sheet = Foundation.stylesheet;
adjust_pip : function (dropdown,target,settings,position) {
var sheet = Foundation.stylesheet,
pip_offset_base = 8;

if (this.small()) {
pip_offset_base += p.left - 8;
if (dropdown.hasClass(settings.mega_class)) {
pip_offset_base = position.left + (target.outerWidth()/2) - 8;
}
else if (this.small()) {
pip_offset_base += position.left - 8;
}

this.rule_idx = sheet.cssRules.length;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Foundation.libs.equalizer = {
name : 'equalizer',

version : '5.3.3',
version : '{{VERSION}}',

settings : {
use_tallest: true,
Expand Down
Loading

0 comments on commit 5d7773e

Please sign in to comment.