Updating bower file and recompiling js and css
This commit is contained in:
parent
91ea7d1b1e
commit
3c33e0cbff
|
@ -26,11 +26,11 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fontawesome": "~4.6.3",
|
"fontawesome": "~4.6.3",
|
||||||
"_s": "https://github.com/Automattic/_s.git",
|
"_s": "https://github.com/Automattic/_s.git",
|
||||||
"OwlCarousel2": "https://github.com/smashingboxes/OwlCarousel2.git",
|
"OwlCarousel2": "2.1.6",
|
||||||
"bootstrap": "v4.0.0-alpha.2",
|
"bootstrap": "v4.0.0-alpha.2",
|
||||||
"tether": "~1.3.2"
|
"tether": "~1.3.2"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/holger1411/understrap.git",
|
"_source": "https://github.com/holger1411/understrap.git",
|
||||||
"_target": "~0.4.4",
|
"_target": "~0.4.5",
|
||||||
"_originalSource": "understrap"
|
"_originalSource": "understrap"
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* Owl Carousel v2.1.4
|
* Owl Carousel v2.1.6
|
||||||
* Copyright 2013-2016 David Deutsch
|
* Copyright 2013-2016 David Deutsch
|
||||||
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* Owl Carousel v2.1.4
|
* Owl Carousel v2.1.6
|
||||||
* Copyright 2013-2016 David Deutsch
|
* Copyright 2013-2016 David Deutsch
|
||||||
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* Owl Carousel v2.1.4
|
* Owl Carousel v2.1.6
|
||||||
* Copyright 2013-2016 David Deutsch
|
* Copyright 2013-2016 David Deutsch
|
||||||
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* Owl Carousel v2.1.4
|
* Owl Carousel v2.1.6
|
||||||
* Copyright 2013-2016 David Deutsch
|
* Copyright 2013-2016 David Deutsch
|
||||||
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* Owl Carousel v2.1.4
|
* Owl Carousel v2.1.6
|
||||||
* Copyright 2013-2016 David Deutsch
|
* Copyright 2013-2016 David Deutsch
|
||||||
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/**
|
/**
|
||||||
* Owl Carousel v2.1.4
|
* Owl Carousel v2.1.6
|
||||||
* Copyright 2013-2016 David Deutsch
|
* Copyright 2013-2016 David Deutsch
|
||||||
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
/**
|
/**
|
||||||
* Owl Carousel v2.1.4
|
* Owl Carousel v2.1.6
|
||||||
* Copyright 2013-2016 David Deutsch
|
* Copyright 2013-2016 David Deutsch
|
||||||
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/OwlCarousel2/OwlCarousel2/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
/**
|
/**
|
||||||
* Owl carousel
|
* Owl carousel
|
||||||
* @version 2.1.0
|
* @version 2.1.6
|
||||||
* @author Bartosz Wojciechowski
|
* @author Bartosz Wojciechowski
|
||||||
* @author David Deutsch
|
* @author David Deutsch
|
||||||
* @license The MIT License (MIT)
|
* @license The MIT License (MIT)
|
||||||
|
@ -515,6 +515,9 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
settings = $.extend({}, this.options, overwrites[match]);
|
settings = $.extend({}, this.options, overwrites[match]);
|
||||||
|
if (typeof settings.stagePadding === 'function') {
|
||||||
|
settings.stagePadding = settings.stagePadding();
|
||||||
|
}
|
||||||
delete settings.responsive;
|
delete settings.responsive;
|
||||||
|
|
||||||
// responsive class
|
// responsive class
|
||||||
|
@ -525,13 +528,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.settings === null || this._breakpoint !== match) {
|
this.trigger('change', { property: { name: 'settings', value: settings } });
|
||||||
this.trigger('change', { property: { name: 'settings', value: settings } });
|
this._breakpoint = match;
|
||||||
this._breakpoint = match;
|
this.settings = settings;
|
||||||
this.settings = settings;
|
this.invalidate('settings');
|
||||||
this.invalidate('settings');
|
this.trigger('changed', { property: { name: 'settings', value: this.settings } });
|
||||||
this.trigger('changed', { property: { name: 'settings', value: this.settings } });
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1022,17 +1023,23 @@
|
||||||
Owl.prototype.maximum = function(relative) {
|
Owl.prototype.maximum = function(relative) {
|
||||||
var settings = this.settings,
|
var settings = this.settings,
|
||||||
maximum = this._coordinates.length,
|
maximum = this._coordinates.length,
|
||||||
boundary = Math.abs(this._coordinates[maximum - 1]) - this._width,
|
iterator,
|
||||||
i = -1, j;
|
reciprocalItemsWidth,
|
||||||
|
elementWidth;
|
||||||
|
|
||||||
if (settings.loop) {
|
if (settings.loop) {
|
||||||
maximum = this._clones.length / 2 + this._items.length - 1;
|
maximum = this._clones.length / 2 + this._items.length - 1;
|
||||||
} else if (settings.autoWidth || settings.merge) {
|
} else if (settings.autoWidth || settings.merge) {
|
||||||
// binary search
|
iterator = this._items.length;
|
||||||
while (maximum - i > 1) {
|
reciprocalItemsWidth = this._items[--iterator].width();
|
||||||
Math.abs(this._coordinates[j = maximum + i >> 1]) < boundary
|
elementWidth = this.$element.width();
|
||||||
? i = j : maximum = j;
|
while (iterator--) {
|
||||||
|
reciprocalItemsWidth += this._items[iterator].width() + this.settings.margin;
|
||||||
|
if (reciprocalItemsWidth > elementWidth) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
maximum = iterator + 1;
|
||||||
} else if (settings.center) {
|
} else if (settings.center) {
|
||||||
maximum = this._items.length - 1;
|
maximum = this._items.length - 1;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1295,7 +1302,7 @@
|
||||||
item = this.prepare(item);
|
item = this.prepare(item);
|
||||||
this.$stage.append(item);
|
this.$stage.append(item);
|
||||||
this._items.push(item);
|
this._items.push(item);
|
||||||
this._mergers.push(item.find('[data-merge]').andSelf('[data-merge]').attr('data-merge') * 1 || 1);
|
this._mergers.push(item.find('[data-merge]').addBack('[data-merge]').attr('data-merge') * 1 || 1);
|
||||||
}, this));
|
}, this));
|
||||||
|
|
||||||
this.reset(this.isNumeric(this.settings.startPosition) ? this.settings.startPosition : 0);
|
this.reset(this.isNumeric(this.settings.startPosition) ? this.settings.startPosition : 0);
|
||||||
|
@ -1324,11 +1331,11 @@
|
||||||
this._items.length === 0 && this.$stage.append(content);
|
this._items.length === 0 && this.$stage.append(content);
|
||||||
this._items.length !== 0 && this._items[position - 1].after(content);
|
this._items.length !== 0 && this._items[position - 1].after(content);
|
||||||
this._items.push(content);
|
this._items.push(content);
|
||||||
this._mergers.push(content.find('[data-merge]').andSelf('[data-merge]').attr('data-merge') * 1 || 1);
|
this._mergers.push(content.find('[data-merge]').addBack('[data-merge]').attr('data-merge') * 1 || 1);
|
||||||
} else {
|
} else {
|
||||||
this._items[position].before(content);
|
this._items[position].before(content);
|
||||||
this._items.splice(position, 0, content);
|
this._items.splice(position, 0, content);
|
||||||
this._mergers.splice(position, 0, content.find('[data-merge]').andSelf('[data-merge]').attr('data-merge') * 1 || 1);
|
this._mergers.splice(position, 0, content.find('[data-merge]').addBack('[data-merge]').attr('data-merge') * 1 || 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
this._items[current] && this.reset(this._items[current].index());
|
this._items[current] && this.reset(this._items[current].index());
|
||||||
|
|
File diff suppressed because one or more lines are too long
Reference in New Issue