You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/06/13 20:53:57 UTC
[18/50] [abbrv] USERGRID-173 - change password doesn't work
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/angular/bower.json
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/angular/bower.json b/portal/dist/usergrid-portal/bower_components/angular/bower.json
index 877c8cc..5df52af 100644
--- a/portal/dist/usergrid-portal/bower_components/angular/bower.json
+++ b/portal/dist/usergrid-portal/bower_components/angular/bower.json
@@ -1,6 +1,6 @@
{
"name": "angular",
- "version": "1.3.0-build.2607+sha.b2e48e6",
+ "version": "1.3.0-build.2812+sha.2d5a849",
"main": "./angular.js",
"dependencies": {
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/CHANGELOG.md b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/CHANGELOG.md
index d6c5c99..53b206a 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/CHANGELOG.md
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/CHANGELOG.md
@@ -1,5 +1,15 @@
# Changelog
+## v2.0.5
+
+- Allow sticky users to define which direction the stuck class shold be applied. (Issue #192)
+- Fix bug where short content on a large screen could cause the infinite shortcut to stall after the first page load. (Issue #207)
+- Make `unsticky` safe to use on any element. Previously it would unwrap the parent even if the element had never had `sticky` called on it or already had `unsticky` called previously. (Issue #225)
+- Fix bug that would cause handlers to be overwritten when trying to reuse an options object. (Issue #253)
+- Remove "More" link when infinite shortcut reaches last page. (Issue #260)
+- Fix use of `this` instead of `window`, causing Browserify to fail. (Issue #262)
+- Stop using deprecated jQuery `load` method. (Issue #283)
+
## v2.0.4
- Fix enable, disable, and destroys calls not chaining the jQuery object. (Issue #244) (Thanks [@robharper](https://github.com/robharper))
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/bower.json
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/bower.json b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/bower.json
index 16a1331..340f185 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/bower.json
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/bower.json
@@ -1,6 +1,6 @@
{
"name": "jquery-waypoints",
- "version": "2.0.4",
+ "version": "2.0.5",
"main": "waypoints.js",
"description": "A jQuery plugin that makes it easy to execute a function whenever you scroll to an element.",
"ignore": [
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/package.json
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/package.json b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/package.json
index f62b20f..e184938 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/package.json
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/package.json
@@ -1,6 +1,6 @@
{
"name": "jquery-waypoints",
- "version": "2.0.4",
+ "version": "2.0.5",
"author": "Caleb Troughton <ca...@imakewebthings.com>",
"description": "A jQuery plugin that makes it easy to execute a function whenever you scroll to an element.",
"repository": {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.js
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.js b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.js
index 7c59722..9b5b3f4 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.js
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.js
@@ -1,8 +1,8 @@
// Generated by CoffeeScript 1.6.2
/*
-Infinite Scroll Shortcut for jQuery Waypoints - v2.0.4
+Infinite Scroll Shortcut for jQuery Waypoints - v2.0.5
Copyright (c) 2011-2014 Caleb Troughton
-Dual licensed under the MIT license and GPL license.
+Licensed under the MIT license.
https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
*/
@@ -14,7 +14,7 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
} else {
return factory(root.jQuery);
}
- })(this, function($) {
+ })(window, function($) {
var defaults;
defaults = {
@@ -27,40 +27,43 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
onAfterPageLoad: $.noop
};
return $.waypoints('extendFn', 'infinite', function(options) {
- var $container;
+ var $container, opts;
- options = $.extend({}, $.fn.waypoint.defaults, defaults, options);
- if ($(options.more).length === 0) {
+ opts = $.extend({}, $.fn.waypoint.defaults, defaults, options);
+ if ($(opts.more).length === 0) {
return this;
}
- $container = options.container === 'auto' ? this : $(options.container);
- options.handler = function(direction) {
+ $container = opts.container === 'auto' ? this : $(opts.container);
+ opts.handler = function(direction) {
var $this;
if (direction === 'down' || direction === 'right') {
$this = $(this);
- options.onBeforePageLoad();
- $this.waypoint('disable');
- $container.addClass(options.loadingClass);
- return $.get($(options.more).attr('href'), function(data) {
- var $data, $more, $newMore;
+ opts.onBeforePageLoad();
+ $this.waypoint('destroy');
+ $container.addClass(opts.loadingClass);
+ return $.get($(opts.more).attr('href'), function(data) {
+ var $data, $more, $newMore, fn;
$data = $($.parseHTML(data));
- $more = $(options.more);
- $newMore = $data.find(options.more);
- $container.append($data.find(options.items));
- $container.removeClass(options.loadingClass);
+ $more = $(opts.more);
+ $newMore = $data.find(opts.more);
+ $container.append($data.find(opts.items));
+ $container.removeClass(opts.loadingClass);
if ($newMore.length) {
$more.replaceWith($newMore);
- $this.waypoint('enable');
+ fn = function() {
+ return $this.waypoint(opts);
+ };
+ setTimeout(fn, 0);
} else {
- $this.waypoint('destroy');
+ $more.remove();
}
- return options.onAfterPageLoad();
+ return opts.onAfterPageLoad();
});
}
};
- return this.waypoint(options);
+ return this.waypoint(opts);
});
});
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.min.js
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.min.js b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.min.js
index 70785d0..006f4f0 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.min.js
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/infinite-scroll/waypoints-infinite.min.js
@@ -1,8 +1,8 @@
// Generated by CoffeeScript 1.6.2
/*
-Infinite Scroll Shortcut for jQuery Waypoints - v2.0.4
+Infinite Scroll Shortcut for jQuery Waypoints - v2.0.5
Copyright (c) 2011-2014 Caleb Troughton
-Dual licensed under the MIT license and GPL license.
+Licensed under the MIT license.
https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
*/
-(function(){(function(n,e){if(typeof define==="function"&&define.amd){return define(["jquery","waypoints"],e)}else{return e(n.jQuery)}})(this,function(n){var e;e={container:"auto",items:".infinite-item",more:".infinite-more-link",offset:"bottom-in-view",loadingClass:"infinite-loading",onBeforePageLoad:n.noop,onAfterPageLoad:n.noop};return n.waypoints("extendFn","infinite",function(i){var t;i=n.extend({},n.fn.waypoint.defaults,e,i);if(n(i.more).length===0){return this}t=i.container==="auto"?this:n(i.container);i.handler=function(e){var o;if(e==="down"||e==="right"){o=n(this);i.onBeforePageLoad();o.waypoint("disable");t.addClass(i.loadingClass);return n.get(n(i.more).attr("href"),function(e){var a,r,f;a=n(n.parseHTML(e));r=n(i.more);f=a.find(i.more);t.append(a.find(i.items));t.removeClass(i.loadingClass);if(f.length){r.replaceWith(f);o.waypoint("enable")}else{o.waypoint("destroy")}return i.onAfterPageLoad()})}};return this.waypoint(i)})})}).call(this);
\ No newline at end of file
+(function(){(function(n,e){if(typeof define==="function"&&define.amd){return define(["jquery","waypoints"],e)}else{return e(n.jQuery)}})(window,function(n){var e;e={container:"auto",items:".infinite-item",more:".infinite-more-link",offset:"bottom-in-view",loadingClass:"infinite-loading",onBeforePageLoad:n.noop,onAfterPageLoad:n.noop};return n.waypoints("extendFn","infinite",function(t){var i,o;o=n.extend({},n.fn.waypoint.defaults,e,t);if(n(o.more).length===0){return this}i=o.container==="auto"?this:n(o.container);o.handler=function(e){var t;if(e==="down"||e==="right"){t=n(this);o.onBeforePageLoad();t.waypoint("destroy");i.addClass(o.loadingClass);return n.get(n(o.more).attr("href"),function(e){var r,a,f,s;r=n(n.parseHTML(e));a=n(o.more);f=r.find(o.more);i.append(r.find(o.items));i.removeClass(o.loadingClass);if(f.length){a.replaceWith(f);s=function(){return t.waypoint(o)};setTimeout(s,0)}else{a.remove()}return o.onAfterPageLoad()})}};return this.waypoint(o)})})}).call(this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.js
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.js b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.js
index ceda329..1befd72 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.js
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.js
@@ -1,8 +1,8 @@
// Generated by CoffeeScript 1.6.2
/*
-Sticky Elements Shortcut for jQuery Waypoints - v2.0.4
+Sticky Elements Shortcut for jQuery Waypoints - v2.0.5
Copyright (c) 2011-2014 Caleb Troughton
-Dual licensed under the MIT license and GPL license.
+Licensed under the MIT license.
https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
*/
@@ -14,16 +14,20 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
} else {
return factory(root.jQuery);
}
- })(this, function($) {
+ })(window, function($) {
var defaults, wrap;
defaults = {
wrapper: '<div class="sticky-wrapper" />',
- stuckClass: 'stuck'
+ stuckClass: 'stuck',
+ direction: 'down right'
};
wrap = function($elements, options) {
+ var $parent;
+
$elements.wrap(options.wrapper);
- return $elements.parent();
+ $parent = $elements.parent();
+ return $parent.data('isWaypointStickyWrapper', true);
};
$.waypoints('extendFn', 'sticky', function(opt) {
var $wrap, options, originalHandler;
@@ -35,7 +39,7 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
var $sticky, shouldBeStuck;
$sticky = $(this).children(':first');
- shouldBeStuck = direction === 'down' || direction === 'right';
+ shouldBeStuck = options.direction.indexOf(direction) !== -1;
$sticky.toggleClass(options.stuckClass, shouldBeStuck);
$wrap.height(shouldBeStuck ? $sticky.outerHeight() : '');
if (originalHandler != null) {
@@ -46,7 +50,13 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
return this.data('stuckClass', options.stuckClass);
});
return $.waypoints('extendFn', 'unsticky', function() {
- this.parent().waypoint('destroy');
+ var $parent;
+
+ $parent = this.parent();
+ if (!$parent.data('isWaypointStickyWrapper')) {
+ return this;
+ }
+ $parent.waypoint('destroy');
this.unwrap();
return this.removeClass(this.data('stuckClass'));
});
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.min.js
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.min.js b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.min.js
index 3962802..c3d01d3 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.min.js
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/shortcuts/sticky-elements/waypoints-sticky.min.js
@@ -1,8 +1,8 @@
// Generated by CoffeeScript 1.6.2
/*
-Sticky Elements Shortcut for jQuery Waypoints - v2.0.4
+Sticky Elements Shortcut for jQuery Waypoints - v2.0.5
Copyright (c) 2011-2014 Caleb Troughton
-Dual licensed under the MIT license and GPL license.
+Licensed under the MIT license.
https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
*/
-(function(){(function(t,n){if(typeof define==="function"&&define.amd){return define(["jquery","waypoints"],n)}else{return n(t.jQuery)}})(this,function(t){var n,s;n={wrapper:'<div class="sticky-wrapper" />',stuckClass:"stuck"};s=function(t,n){t.wrap(n.wrapper);return t.parent()};t.waypoints("extendFn","sticky",function(e){var i,r,a;r=t.extend({},t.fn.waypoint.defaults,n,e);i=s(this,r);a=r.handler;r.handler=function(n){var s,e;s=t(this).children(":first");e=n==="down"||n==="right";s.toggleClass(r.stuckClass,e);i.height(e?s.outerHeight():"");if(a!=null){return a.call(this,n)}};i.waypoint(r);return this.data("stuckClass",r.stuckClass)});return t.waypoints("extendFn","unsticky",function(){this.parent().waypoint("destroy");this.unwrap();return this.removeClass(this.data("stuckClass"))})})}).call(this);
\ No newline at end of file
+(function(){(function(t,n){if(typeof define==="function"&&define.amd){return define(["jquery","waypoints"],n)}else{return n(t.jQuery)}})(window,function(t){var n,i;n={wrapper:'<div class="sticky-wrapper" />',stuckClass:"stuck",direction:"down right"};i=function(t,n){var i;t.wrap(n.wrapper);i=t.parent();return i.data("isWaypointStickyWrapper",true)};t.waypoints("extendFn","sticky",function(r){var e,a,s;a=t.extend({},t.fn.waypoint.defaults,n,r);e=i(this,a);s=a.handler;a.handler=function(n){var i,r;i=t(this).children(":first");r=a.direction.indexOf(n)!==-1;i.toggleClass(a.stuckClass,r);e.height(r?i.outerHeight():"");if(s!=null){return s.call(this,n)}};e.waypoint(a);return this.data("stuckClass",a.stuckClass)});return t.waypoints("extendFn","unsticky",function(){var t;t=this.parent();if(!t.data("isWaypointStickyWrapper")){return this}t.waypoint("destroy");this.unwrap();return this.removeClass(this.data("stuckClass"))})})}).call(this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.js
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.js b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.js
index 2987f87..4f9a33b 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.js
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.js
@@ -1,8 +1,8 @@
// Generated by CoffeeScript 1.6.2
-/*
-jQuery Waypoints - v2.0.4
+/*!
+jQuery Waypoints - v2.0.5
Copyright (c) 2011-2014 Caleb Troughton
-Dual licensed under the MIT license and GPL license.
+Licensed under the MIT license.
https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
*/
@@ -19,7 +19,7 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
} else {
return factory(root.jQuery, root);
}
- })(this, function($, window) {
+ })(window, function($, window) {
var $w, Context, Waypoint, allWaypoints, contextCounter, contextKey, contexts, isTouch, jQMethods, methods, resizeEvent, scrollEvent, waypointCounter, waypointKey, wp, wps;
$w = $(window);
@@ -207,7 +207,6 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
function Waypoint($element, context, options) {
var idList, _ref;
- options = $.extend({}, $.fn[wp].defaults, options);
if (options.offset === 'bottom-in-view') {
options.offset = function() {
var contextHeight;
@@ -282,9 +281,7 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
init: function(f, options) {
var _ref;
- if (options == null) {
- options = {};
- }
+ options = $.extend({}, $.fn[wp].defaults, options);
if ((_ref = options.handler) == null) {
options.handler = f;
}
@@ -512,7 +509,7 @@ https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
resizeThrottle: 100,
scrollThrottle: 30
};
- return $w.load(function() {
+ return $w.on('load.waypoints', function() {
return $[wps]('refresh');
});
});
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.min.js
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.min.js b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.min.js
index 8281ad7..b9098f8 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.min.js
+++ b/portal/dist/usergrid-portal/bower_components/jquery-waypoints/waypoints.min.js
@@ -1,8 +1,8 @@
// Generated by CoffeeScript 1.6.2
-/*
-jQuery Waypoints - v2.0.4
+/*!
+jQuery Waypoints - v2.0.5
Copyright (c) 2011-2014 Caleb Troughton
-Dual licensed under the MIT license and GPL license.
+Licensed under the MIT license.
https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
*/
-(function(){var t=[].indexOf||function(t){for(var e=0,n=this.length;e<n;e++){if(e in this&&this[e]===t)return e}return-1},e=[].slice;(function(t,e){if(typeof define==="function"&&define.amd){return define("waypoints",["jquery"],function(n){return e(n,t)})}else{return e(t.jQuery,t)}})(this,function(n,r){var i,o,l,s,f,u,c,a,h,d,p,y,v,w,g,m;i=n(r);a=t.call(r,"ontouchstart")>=0;s={horizontal:{},vertical:{}};f=1;c={};u="waypoints-context-id";p="resize.waypoints";y="scroll.waypoints";v=1;w="waypoints-waypoint-ids";g="waypoint";m="waypoints";o=function(){function t(t){var e=this;this.$element=t;this.element=t[0];this.didResize=false;this.didScroll=false;this.id="context"+f++;this.oldScroll={x:t.scrollLeft(),y:t.scrollTop()};this.waypoints={horizontal:{},vertical:{}};this.element[u]=this.id;c[this.id]=this;t.bind(y,function(){var t;if(!(e.didScroll||a)){e.didScroll=true;t=function(){e.doScroll();return e.didScroll=false};return r.setTimeout(t,n[m].settings.scrollThrottle)}});t.bind(p,functi
on(){var t;if(!e.didResize){e.didResize=true;t=function(){n[m]("refresh");return e.didResize=false};return r.setTimeout(t,n[m].settings.resizeThrottle)}})}t.prototype.doScroll=function(){var t,e=this;t={horizontal:{newScroll:this.$element.scrollLeft(),oldScroll:this.oldScroll.x,forward:"right",backward:"left"},vertical:{newScroll:this.$element.scrollTop(),oldScroll:this.oldScroll.y,forward:"down",backward:"up"}};if(a&&(!t.vertical.oldScroll||!t.vertical.newScroll)){n[m]("refresh")}n.each(t,function(t,r){var i,o,l;l=[];o=r.newScroll>r.oldScroll;i=o?r.forward:r.backward;n.each(e.waypoints[t],function(t,e){var n,i;if(r.oldScroll<(n=e.offset)&&n<=r.newScroll){return l.push(e)}else if(r.newScroll<(i=e.offset)&&i<=r.oldScroll){return l.push(e)}});l.sort(function(t,e){return t.offset-e.offset});if(!o){l.reverse()}return n.each(l,function(t,e){if(e.options.continuous||t===l.length-1){return e.trigger([i])}})});return this.oldScroll={x:t.horizontal.newScroll,y:t.vertical.newScroll}};t.protot
ype.refresh=function(){var t,e,r,i=this;r=n.isWindow(this.element);e=this.$element.offset();this.doScroll();t={horizontal:{contextOffset:r?0:e.left,contextScroll:r?0:this.oldScroll.x,contextDimension:this.$element.width(),oldScroll:this.oldScroll.x,forward:"right",backward:"left",offsetProp:"left"},vertical:{contextOffset:r?0:e.top,contextScroll:r?0:this.oldScroll.y,contextDimension:r?n[m]("viewportHeight"):this.$element.height(),oldScroll:this.oldScroll.y,forward:"down",backward:"up",offsetProp:"top"}};return n.each(t,function(t,e){return n.each(i.waypoints[t],function(t,r){var i,o,l,s,f;i=r.options.offset;l=r.offset;o=n.isWindow(r.element)?0:r.$element.offset()[e.offsetProp];if(n.isFunction(i)){i=i.apply(r.element)}else if(typeof i==="string"){i=parseFloat(i);if(r.options.offset.indexOf("%")>-1){i=Math.ceil(e.contextDimension*i/100)}}r.offset=o-e.contextOffset+e.contextScroll-i;if(r.options.onlyOnScroll&&l!=null||!r.enabled){return}if(l!==null&&l<(s=e.oldScroll)&&s<=r.offset){retu
rn r.trigger([e.backward])}else if(l!==null&&l>(f=e.oldScroll)&&f>=r.offset){return r.trigger([e.forward])}else if(l===null&&e.oldScroll>=r.offset){return r.trigger([e.forward])}})})};t.prototype.checkEmpty=function(){if(n.isEmptyObject(this.waypoints.horizontal)&&n.isEmptyObject(this.waypoints.vertical)){this.$element.unbind([p,y].join(" "));return delete c[this.id]}};return t}();l=function(){function t(t,e,r){var i,o;r=n.extend({},n.fn[g].defaults,r);if(r.offset==="bottom-in-view"){r.offset=function(){var t;t=n[m]("viewportHeight");if(!n.isWindow(e.element)){t=e.$element.height()}return t-n(this).outerHeight()}}this.$element=t;this.element=t[0];this.axis=r.horizontal?"horizontal":"vertical";this.callback=r.handler;this.context=e;this.enabled=r.enabled;this.id="waypoints"+v++;this.offset=null;this.options=r;e.waypoints[this.axis][this.id]=this;s[this.axis][this.id]=this;i=(o=this.element[w])!=null?o:[];i.push(this.id);this.element[w]=i}t.prototype.trigger=function(t){if(!this.enabl
ed){return}if(this.callback!=null){this.callback.apply(this.element,t)}if(this.options.triggerOnce){return this.destroy()}};t.prototype.disable=function(){return this.enabled=false};t.prototype.enable=function(){this.context.refresh();return this.enabled=true};t.prototype.destroy=function(){delete s[this.axis][this.id];delete this.context.waypoints[this.axis][this.id];return this.context.checkEmpty()};t.getWaypointsByElement=function(t){var e,r;r=t[w];if(!r){return[]}e=n.extend({},s.horizontal,s.vertical);return n.map(r,function(t){return e[t]})};return t}();d={init:function(t,e){var r;if(e==null){e={}}if((r=e.handler)==null){e.handler=t}this.each(function(){var t,r,i,s;t=n(this);i=(s=e.context)!=null?s:n.fn[g].defaults.context;if(!n.isWindow(i)){i=t.closest(i)}i=n(i);r=c[i[0][u]];if(!r){r=new o(i)}return new l(t,r,e)});n[m]("refresh");return this},disable:function(){return d._invoke.call(this,"disable")},enable:function(){return d._invoke.call(this,"enable")},destroy:function(){ret
urn d._invoke.call(this,"destroy")},prev:function(t,e){return d._traverse.call(this,t,e,function(t,e,n){if(e>0){return t.push(n[e-1])}})},next:function(t,e){return d._traverse.call(this,t,e,function(t,e,n){if(e<n.length-1){return t.push(n[e+1])}})},_traverse:function(t,e,i){var o,l;if(t==null){t="vertical"}if(e==null){e=r}l=h.aggregate(e);o=[];this.each(function(){var e;e=n.inArray(this,l[t]);return i(o,e,l[t])});return this.pushStack(o)},_invoke:function(t){this.each(function(){var e;e=l.getWaypointsByElement(this);return n.each(e,function(e,n){n[t]();return true})});return this}};n.fn[g]=function(){var t,r;r=arguments[0],t=2<=arguments.length?e.call(arguments,1):[];if(d[r]){return d[r].apply(this,t)}else if(n.isFunction(r)){return d.init.apply(this,arguments)}else if(n.isPlainObject(r)){return d.init.apply(this,[null,r])}else if(!r){return n.error("jQuery Waypoints needs a callback function or handler option.")}else{return n.error("The "+r+" method does not exist in jQuery Waypoin
ts.")}};n.fn[g].defaults={context:r,continuous:true,enabled:true,horizontal:false,offset:0,triggerOnce:false};h={refresh:function(){return n.each(c,function(t,e){return e.refresh()})},viewportHeight:function(){var t;return(t=r.innerHeight)!=null?t:i.height()},aggregate:function(t){var e,r,i;e=s;if(t){e=(i=c[n(t)[0][u]])!=null?i.waypoints:void 0}if(!e){return[]}r={horizontal:[],vertical:[]};n.each(r,function(t,i){n.each(e[t],function(t,e){return i.push(e)});i.sort(function(t,e){return t.offset-e.offset});r[t]=n.map(i,function(t){return t.element});return r[t]=n.unique(r[t])});return r},above:function(t){if(t==null){t=r}return h._filter(t,"vertical",function(t,e){return e.offset<=t.oldScroll.y})},below:function(t){if(t==null){t=r}return h._filter(t,"vertical",function(t,e){return e.offset>t.oldScroll.y})},left:function(t){if(t==null){t=r}return h._filter(t,"horizontal",function(t,e){return e.offset<=t.oldScroll.x})},right:function(t){if(t==null){t=r}return h._filter(t,"horizontal",fun
ction(t,e){return e.offset>t.oldScroll.x})},enable:function(){return h._invoke("enable")},disable:function(){return h._invoke("disable")},destroy:function(){return h._invoke("destroy")},extendFn:function(t,e){return d[t]=e},_invoke:function(t){var e;e=n.extend({},s.vertical,s.horizontal);return n.each(e,function(e,n){n[t]();return true})},_filter:function(t,e,r){var i,o;i=c[n(t)[0][u]];if(!i){return[]}o=[];n.each(i.waypoints[e],function(t,e){if(r(i,e)){return o.push(e)}});o.sort(function(t,e){return t.offset-e.offset});return n.map(o,function(t){return t.element})}};n[m]=function(){var t,n;n=arguments[0],t=2<=arguments.length?e.call(arguments,1):[];if(h[n]){return h[n].apply(null,t)}else{return h.aggregate.call(null,n)}};n[m].settings={resizeThrottle:100,scrollThrottle:30};return i.load(function(){return n[m]("refresh")})})}).call(this);
\ No newline at end of file
+(function(){var t=[].indexOf||function(t){for(var e=0,n=this.length;e<n;e++){if(e in this&&this[e]===t)return e}return-1},e=[].slice;(function(t,e){if(typeof define==="function"&&define.amd){return define("waypoints",["jquery"],function(n){return e(n,t)})}else{return e(t.jQuery,t)}})(window,function(n,r){var i,o,l,s,f,u,c,a,h,d,p,y,v,w,g,m;i=n(r);a=t.call(r,"ontouchstart")>=0;s={horizontal:{},vertical:{}};f=1;c={};u="waypoints-context-id";p="resize.waypoints";y="scroll.waypoints";v=1;w="waypoints-waypoint-ids";g="waypoint";m="waypoints";o=function(){function t(t){var e=this;this.$element=t;this.element=t[0];this.didResize=false;this.didScroll=false;this.id="context"+f++;this.oldScroll={x:t.scrollLeft(),y:t.scrollTop()};this.waypoints={horizontal:{},vertical:{}};this.element[u]=this.id;c[this.id]=this;t.bind(y,function(){var t;if(!(e.didScroll||a)){e.didScroll=true;t=function(){e.doScroll();return e.didScroll=false};return r.setTimeout(t,n[m].settings.scrollThrottle)}});t.bind(p,func
tion(){var t;if(!e.didResize){e.didResize=true;t=function(){n[m]("refresh");return e.didResize=false};return r.setTimeout(t,n[m].settings.resizeThrottle)}})}t.prototype.doScroll=function(){var t,e=this;t={horizontal:{newScroll:this.$element.scrollLeft(),oldScroll:this.oldScroll.x,forward:"right",backward:"left"},vertical:{newScroll:this.$element.scrollTop(),oldScroll:this.oldScroll.y,forward:"down",backward:"up"}};if(a&&(!t.vertical.oldScroll||!t.vertical.newScroll)){n[m]("refresh")}n.each(t,function(t,r){var i,o,l;l=[];o=r.newScroll>r.oldScroll;i=o?r.forward:r.backward;n.each(e.waypoints[t],function(t,e){var n,i;if(r.oldScroll<(n=e.offset)&&n<=r.newScroll){return l.push(e)}else if(r.newScroll<(i=e.offset)&&i<=r.oldScroll){return l.push(e)}});l.sort(function(t,e){return t.offset-e.offset});if(!o){l.reverse()}return n.each(l,function(t,e){if(e.options.continuous||t===l.length-1){return e.trigger([i])}})});return this.oldScroll={x:t.horizontal.newScroll,y:t.vertical.newScroll}};t.prot
otype.refresh=function(){var t,e,r,i=this;r=n.isWindow(this.element);e=this.$element.offset();this.doScroll();t={horizontal:{contextOffset:r?0:e.left,contextScroll:r?0:this.oldScroll.x,contextDimension:this.$element.width(),oldScroll:this.oldScroll.x,forward:"right",backward:"left",offsetProp:"left"},vertical:{contextOffset:r?0:e.top,contextScroll:r?0:this.oldScroll.y,contextDimension:r?n[m]("viewportHeight"):this.$element.height(),oldScroll:this.oldScroll.y,forward:"down",backward:"up",offsetProp:"top"}};return n.each(t,function(t,e){return n.each(i.waypoints[t],function(t,r){var i,o,l,s,f;i=r.options.offset;l=r.offset;o=n.isWindow(r.element)?0:r.$element.offset()[e.offsetProp];if(n.isFunction(i)){i=i.apply(r.element)}else if(typeof i==="string"){i=parseFloat(i);if(r.options.offset.indexOf("%")>-1){i=Math.ceil(e.contextDimension*i/100)}}r.offset=o-e.contextOffset+e.contextScroll-i;if(r.options.onlyOnScroll&&l!=null||!r.enabled){return}if(l!==null&&l<(s=e.oldScroll)&&s<=r.offset){re
turn r.trigger([e.backward])}else if(l!==null&&l>(f=e.oldScroll)&&f>=r.offset){return r.trigger([e.forward])}else if(l===null&&e.oldScroll>=r.offset){return r.trigger([e.forward])}})})};t.prototype.checkEmpty=function(){if(n.isEmptyObject(this.waypoints.horizontal)&&n.isEmptyObject(this.waypoints.vertical)){this.$element.unbind([p,y].join(" "));return delete c[this.id]}};return t}();l=function(){function t(t,e,r){var i,o;if(r.offset==="bottom-in-view"){r.offset=function(){var t;t=n[m]("viewportHeight");if(!n.isWindow(e.element)){t=e.$element.height()}return t-n(this).outerHeight()}}this.$element=t;this.element=t[0];this.axis=r.horizontal?"horizontal":"vertical";this.callback=r.handler;this.context=e;this.enabled=r.enabled;this.id="waypoints"+v++;this.offset=null;this.options=r;e.waypoints[this.axis][this.id]=this;s[this.axis][this.id]=this;i=(o=this.element[w])!=null?o:[];i.push(this.id);this.element[w]=i}t.prototype.trigger=function(t){if(!this.enabled){return}if(this.callback!=nul
l){this.callback.apply(this.element,t)}if(this.options.triggerOnce){return this.destroy()}};t.prototype.disable=function(){return this.enabled=false};t.prototype.enable=function(){this.context.refresh();return this.enabled=true};t.prototype.destroy=function(){delete s[this.axis][this.id];delete this.context.waypoints[this.axis][this.id];return this.context.checkEmpty()};t.getWaypointsByElement=function(t){var e,r;r=t[w];if(!r){return[]}e=n.extend({},s.horizontal,s.vertical);return n.map(r,function(t){return e[t]})};return t}();d={init:function(t,e){var r;e=n.extend({},n.fn[g].defaults,e);if((r=e.handler)==null){e.handler=t}this.each(function(){var t,r,i,s;t=n(this);i=(s=e.context)!=null?s:n.fn[g].defaults.context;if(!n.isWindow(i)){i=t.closest(i)}i=n(i);r=c[i[0][u]];if(!r){r=new o(i)}return new l(t,r,e)});n[m]("refresh");return this},disable:function(){return d._invoke.call(this,"disable")},enable:function(){return d._invoke.call(this,"enable")},destroy:function(){return d._invoke.c
all(this,"destroy")},prev:function(t,e){return d._traverse.call(this,t,e,function(t,e,n){if(e>0){return t.push(n[e-1])}})},next:function(t,e){return d._traverse.call(this,t,e,function(t,e,n){if(e<n.length-1){return t.push(n[e+1])}})},_traverse:function(t,e,i){var o,l;if(t==null){t="vertical"}if(e==null){e=r}l=h.aggregate(e);o=[];this.each(function(){var e;e=n.inArray(this,l[t]);return i(o,e,l[t])});return this.pushStack(o)},_invoke:function(t){this.each(function(){var e;e=l.getWaypointsByElement(this);return n.each(e,function(e,n){n[t]();return true})});return this}};n.fn[g]=function(){var t,r;r=arguments[0],t=2<=arguments.length?e.call(arguments,1):[];if(d[r]){return d[r].apply(this,t)}else if(n.isFunction(r)){return d.init.apply(this,arguments)}else if(n.isPlainObject(r)){return d.init.apply(this,[null,r])}else if(!r){return n.error("jQuery Waypoints needs a callback function or handler option.")}else{return n.error("The "+r+" method does not exist in jQuery Waypoints.")}};n.fn[g]
.defaults={context:r,continuous:true,enabled:true,horizontal:false,offset:0,triggerOnce:false};h={refresh:function(){return n.each(c,function(t,e){return e.refresh()})},viewportHeight:function(){var t;return(t=r.innerHeight)!=null?t:i.height()},aggregate:function(t){var e,r,i;e=s;if(t){e=(i=c[n(t)[0][u]])!=null?i.waypoints:void 0}if(!e){return[]}r={horizontal:[],vertical:[]};n.each(r,function(t,i){n.each(e[t],function(t,e){return i.push(e)});i.sort(function(t,e){return t.offset-e.offset});r[t]=n.map(i,function(t){return t.element});return r[t]=n.unique(r[t])});return r},above:function(t){if(t==null){t=r}return h._filter(t,"vertical",function(t,e){return e.offset<=t.oldScroll.y})},below:function(t){if(t==null){t=r}return h._filter(t,"vertical",function(t,e){return e.offset>t.oldScroll.y})},left:function(t){if(t==null){t=r}return h._filter(t,"horizontal",function(t,e){return e.offset<=t.oldScroll.x})},right:function(t){if(t==null){t=r}return h._filter(t,"horizontal",function(t,e){retu
rn e.offset>t.oldScroll.x})},enable:function(){return h._invoke("enable")},disable:function(){return h._invoke("disable")},destroy:function(){return h._invoke("destroy")},extendFn:function(t,e){return d[t]=e},_invoke:function(t){var e;e=n.extend({},s.vertical,s.horizontal);return n.each(e,function(e,n){n[t]();return true})},_filter:function(t,e,r){var i,o;i=c[n(t)[0][u]];if(!i){return[]}o=[];n.each(i.waypoints[e],function(t,e){if(r(i,e)){return o.push(e)}});o.sort(function(t,e){return t.offset-e.offset});return n.map(o,function(t){return t.element})}};n[m]=function(){var t,n;n=arguments[0],t=2<=arguments.length?e.call(arguments,1):[];if(h[n]){return h[n].apply(null,t)}else{return h.aggregate.call(null,n)}};n[m].settings={resizeThrottle:100,scrollThrottle:30};return i.on("load.waypoints",function(){return n[m]("refresh")})})}).call(this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery/bower.json
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery/bower.json b/portal/dist/usergrid-portal/bower_components/jquery/bower.json
index f5f72c7..c66a750 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery/bower.json
+++ b/portal/dist/usergrid-portal/bower_components/jquery/bower.json
@@ -1,6 +1,6 @@
{
"name": "jquery",
- "version": "2.1.1-beta1",
+ "version": "2.1.1",
"main": "dist/jquery.js",
"license": "MIT",
"ignore": [
@@ -14,7 +14,7 @@
"package.json"
],
"devDependencies": {
- "sizzle": "1.10.18",
+ "sizzle": "1.10.19",
"requirejs": "2.1.10",
"qunit": "1.14.0",
"sinon": "1.8.1"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51594931/portal/dist/usergrid-portal/bower_components/jquery/dist/jquery.js
----------------------------------------------------------------------
diff --git a/portal/dist/usergrid-portal/bower_components/jquery/dist/jquery.js b/portal/dist/usergrid-portal/bower_components/jquery/dist/jquery.js
index 1194199..9f7b3d3 100644
--- a/portal/dist/usergrid-portal/bower_components/jquery/dist/jquery.js
+++ b/portal/dist/usergrid-portal/bower_components/jquery/dist/jquery.js
@@ -1,5 +1,5 @@
/*!
- * jQuery JavaScript Library v2.1.1-beta1
+ * jQuery JavaScript Library v2.1.1
* http://jquery.com/
*
* Includes Sizzle.js
@@ -9,7 +9,7 @@
* Released under the MIT license
* http://jquery.org/license
*
- * Date: 2014-03-24T17:01Z
+ * Date: 2014-05-01T17:11Z
*/
(function( global, factory ) {
@@ -67,7 +67,7 @@ var
// Use the correct document accordingly with window argument (sandbox)
document = window.document,
- version = "2.1.1-beta1",
+ version = "2.1.1",
// Define a local copy of jQuery
jQuery = function( selector, context ) {
@@ -548,14 +548,14 @@ function isArraylike( obj ) {
}
var Sizzle =
/*!
- * Sizzle CSS Selector Engine v1.10.18
+ * Sizzle CSS Selector Engine v1.10.19
* http://sizzlejs.com/
*
* Copyright 2013 jQuery Foundation, Inc. and other contributors
* Released under the MIT license
* http://jquery.org/license
*
- * Date: 2014-02-05
+ * Date: 2014-04-18
*/
(function( window ) {
@@ -564,6 +564,7 @@ var i,
Expr,
getText,
isXML,
+ tokenize,
compile,
select,
outermostContext,
@@ -632,17 +633,23 @@ var i,
// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
identifier = characterEncoding.replace( "w", "w#" ),
- // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
- attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
- "*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
- // Prefer arguments quoted,
- // then not containing pseudos/brackets,
- // then attribute selectors/non-parenthetical expressions,
- // then anything else
- // These preferences are here to reduce the number of selectors
- // needing tokenize in the PSEUDO preFilter
- pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
+ // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+ attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
+ // Operator (capture 2)
+ "*([*^$|!~]?=)" + whitespace +
+ // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+ "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+ "*\\]",
+
+ pseudos = ":(" + characterEncoding + ")(?:\\((" +
+ // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+ // 1. quoted (capture 3; capture 4 or capture 5)
+ "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+ // 2. simple (capture 6)
+ "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+ // 3. anything else (capture 2)
+ ".*" +
+ ")\\)|)",
// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
@@ -1083,7 +1090,7 @@ setDocument = Sizzle.setDocument = function( node ) {
var m = context.getElementById( id );
// Check parentNode to catch when Blackberry 4.6 returns
// nodes that are no longer in the document #6963
- return m && m.parentNode ? [m] : [];
+ return m && m.parentNode ? [ m ] : [];
}
};
Expr.filter["ID"] = function( id ) {
@@ -1163,11 +1170,13 @@ setDocument = Sizzle.setDocument = function( node ) {
// setting a boolean content attribute,
// since its presence should be enough
// http://bugs.jquery.com/ticket/12359
- div.innerHTML = "<select t=''><option selected=''></option></select>";
+ div.innerHTML = "<select msallowclip=''><option selected=''></option></select>";
- // Support: IE8, Opera 10-12
+ // Support: IE8, Opera 11-12.16
// Nothing should be selected when empty strings follow ^= or $= or *=
- if ( div.querySelectorAll("[t^='']").length ) {
+ // The test attribute must be unknown in Opera but "safe" for WinRT
+ // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+ if ( div.querySelectorAll("[msallowclip^='']").length ) {
rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
}
@@ -1210,7 +1219,8 @@ setDocument = Sizzle.setDocument = function( node ) {
});
}
- if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
+ if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+ docElem.webkitMatchesSelector ||
docElem.mozMatchesSelector ||
docElem.oMatchesSelector ||
docElem.msMatchesSelector) )) ) {
@@ -1391,7 +1401,7 @@ Sizzle.matchesSelector = function( elem, expr ) {
} catch(e) {}
}
- return Sizzle( expr, document, null, [elem] ).length > 0;
+ return Sizzle( expr, document, null, [ elem ] ).length > 0;
};
Sizzle.contains = function( context, elem ) {
@@ -1520,7 +1530,7 @@ Expr = Sizzle.selectors = {
match[1] = match[1].replace( runescape, funescape );
// Move the given value to match[3] whether quoted or unquoted
- match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+ match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
if ( match[2] === "~=" ) {
match[3] = " " + match[3] + " ";
@@ -1563,15 +1573,15 @@ Expr = Sizzle.selectors = {
"PSEUDO": function( match ) {
var excess,
- unquoted = !match[5] && match[2];
+ unquoted = !match[6] && match[2];
if ( matchExpr["CHILD"].test( match[0] ) ) {
return null;
}
// Accept quoted arguments as-is
- if ( match[3] && match[4] !== undefined ) {
- match[2] = match[4];
+ if ( match[3] ) {
+ match[2] = match[4] || match[5] || "";
// Strip excess characters from unquoted arguments
} else if ( unquoted && rpseudo.test( unquoted ) &&
@@ -1976,7 +1986,7 @@ function setFilters() {}
setFilters.prototype = Expr.filters = Expr.pseudos;
Expr.setFilters = new setFilters();
-function tokenize( selector, parseOnly ) {
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
var matched, match, tokens, type,
soFar, groups, preFilters,
cached = tokenCache[ selector + " " ];
@@ -2041,7 +2051,7 @@ function tokenize( selector, parseOnly ) {
Sizzle.error( selector ) :
// Cache the tokens
tokenCache( selector, groups ).slice( 0 );
-}
+};
function toSelector( tokens ) {
var i = 0,
@@ -3755,11 +3765,15 @@ jQuery.fn.extend({
if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
i = attrs.length;
while ( i-- ) {
- name = attrs[ i ].name;
- if ( name.indexOf( "data-" ) === 0 ) {
- name = jQuery.camelCase( name.slice(5) );
- dataAttr( elem, name, data[ name ] );
+ // Support: IE11+
+ // The attrs elements can be null (#14894)
+ if ( attrs[ i ] ) {
+ name = attrs[ i ].name;
+ if ( name.indexOf( "data-" ) === 0 ) {
+ name = jQuery.camelCase( name.slice(5) );
+ dataAttr( elem, name, data[ name ] );
+ }
}
}
data_priv.set( elem, "hasDataAttrs", true );
@@ -5999,7 +6013,7 @@ jQuery.each([ "height", "width" ], function( i, name ) {
if ( computed ) {
// certain elements can have dimension info if we invisibly show them
// however, it must have a current display style that would benefit from this
- return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
+ return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
jQuery.swap( elem, cssShow, function() {
return getWidthOrHeight( elem, name, extra );
}) :
@@ -6320,7 +6334,7 @@ function createTween( value, prop, animation ) {
function defaultPrefilter( elem, props, opts ) {
/* jshint validthis: true */
- var prop, value, toggle, tween, hooks, oldfire, display,
+ var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
anim = this,
orig = {},
style = elem.style,
@@ -6364,10 +6378,12 @@ function defaultPrefilter( elem, props, opts ) {
// Set display property to inline-block for height/width
// animations on inline elements that are having width/height animated
display = jQuery.css( elem, "display" );
+
// Test default display if display is currently "none"
- if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" &&
- jQuery.css( elem, "float" ) === "none" ) {
+ checkDisplay = display === "none" ?
+ data_priv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+ if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
style.display = "inline-block";
}
}