Skip to content

Commit

Permalink
Updates several jquery widgets: colorbox to v1.5.14, jstree to v3.0.4…
Browse files Browse the repository at this point in the history
…, & pwstrength-bootstrap-v1.2.2
  • Loading branch information
dleffler committed Sep 13, 2014
1 parent cf6a457 commit 6a484cf
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 85 deletions.
7 changes: 4 additions & 3 deletions external/ExtPrograms.csv
Expand Up @@ -54,15 +54,16 @@ spectrum,1.5.0,http://bgrins.github.io/spectrum/,1.5.1,
tag-it,2,http://aehlke.github.io/tag-it/,2,renamed css file to same as js file for our loader
multiselect,2,http://mind2soft.com/labs/jquery/multiselect/,2,
excoloSlider,1.1.0,http://excolo.github.io/Excolo-Slider/,1.1.0,
colorbox,1.5.13,http://www.jacklmoore.com/colorbox,1.5.13,using style #5 renamed to jquery.colorbox.css
colorbox,1.5.14,http://www.jacklmoore.com/colorbox,1.5.14,using style #5 renamed to jquery.colorbox.css
Searcher,0.2.0,https://github.com/lloiser/jquery-searcher/,0.2.0,
DateTimePicker,2.3.4exp,http://xdsoft.net/jqplugins/datetimepicker/,2.3.4,added additional 'update' method and click update if inline
TimeCircles,1.5.3,https://github.com/wimbarelds/TimeCircles,1.5.3,
pwstrength-bootstrap,1.2.1,https://github.com/ablanco/jquery.pwstrength.bootstrap,1.2.1,
pwstrength-bootstrap,1.2.2,https://github.com/ablanco/jquery.pwstrength.bootstrap,1.2.2,
Sortable,0.5.0,https://github.com/RubaXa/Sortable,0.5.0,
jstree,3.0.3,https://github.com/vakata/jstree,3.0.3,added nav menu icons to stylesheet
jstree,3.0.4,https://github.com/vakata/jstree,3.0.4,added nav menu icons to stylesheet
bootstrap3-dialog,1.33.4,https://github.com/nakupanda/bootstrap3-dialog,1.33.4,
impromptu,5.2.5,http://trentrichardson.com/Impromptu,5.2.5,
bootstrap-touch-carousel,0.8.0,https://github.com/ixisio/bootstrap-touch-carousel,0.8.0,
fd-slider,,https://github.com/freqdec/fd-slider,,
number-polyfill,,https://github.com/jonstipe/number-polyfill,,
bootstrap-tagsinput,0.4.2,https://github.com/timschlechter/bootstrap-tagsinput,0.4.2,
14 changes: 7 additions & 7 deletions external/jquery/addons/js/jquery.colorbox.js
@@ -1,8 +1,7 @@
/*!
Colorbox v1.5.13 - 2014-08-04
jQuery lightbox and modal window plugin
(c) 2014 Jack Moore - http://www.jacklmoore.com/colorbox
license: http://www.opensource.org/licenses/mit-license.php
Colorbox 1.5.14
license: MIT
http://www.jacklmoore.com/colorbox
*/
(function ($, document, window) {
var
Expand Down Expand Up @@ -435,7 +434,7 @@
// Colorbox's markup needs to be added to the DOM prior to being called
// so that the browser will go ahead and load the CSS background images.
function appendHTML() {
if (!$box && document.body) {
if (!$box) {
init = false;
$window = $(window);
$box = $tag(div).attr({
Expand Down Expand Up @@ -479,7 +478,8 @@
$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;');

$groupControls = $next.add($prev).add($current).add($slideshow);

}
if (document.body && !$box.parent().length) {
$(document.body).append($overlay, $box.append($wrap, $loadingBay));
}
}
Expand Down Expand Up @@ -697,7 +697,7 @@
}, 1);
}

if (loadedCallback) {
if ($.isFunction(loadedCallback)) {
loadedCallback();
}
},
Expand Down

0 comments on commit 6a484cf

Please sign in to comment.