This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 1d79c8a778079e7d8695e0f1b556e57ec7afeae6 (commit)
from ef064c6094675746282e1a32bc9432a8bf878881 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1d79c8a778079e7d8695e0f1b556e57ec7afeae6
commit 1d79c8a778079e7d8695e0f1b556e57ec7afeae6
Author: Franck Villaume <[email protected]>
Date: Mon May 16 17:00:08 2016 +0200
upgrade to jquery ui 1.11.4 + jquery splitter 0.20.0
diff --git a/src/CHANGES b/src/CHANGES
index b01a6f6..3a76077 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,10 +1,5 @@
FusionForge 6.X:
* Accounts: minimum password length is now 8
-* Spellcheck (Anders Jonsson)
-* Site Admin: add paging system in userlist page [#799] (TrivialDev)
-* Site Admin: support widgets for forge home page (TrivialDev)
-* Projects Page: add paging system in full_list and tag_cloud subpages
(TrivialDev)
-* SearchEngine: support only FTI queries (TrivialDev)
* Docman: limit number of returned documents on search query. Use paging
system [#794] (TrivialDev)
* Docman: limit search using from & to dates [#798] (TrivialDev)
* Docman: use standard search engine: unify results between 'search in
project' & search in the docs tab (TrivialDev)
@@ -13,10 +8,17 @@ FusionForge 6.X:
* Docman: notify users on document. (TrivialDev)
* Docman: support private directory. (TrivialDev)
* Plugin AuthBuiltin: add captcha after 3 attempts with the same login [#795]
(TrivialDev)
-* Widget MySystasks: new widget for user to display systasks perform on user
projects (TrivialDev)
-* Widget ProjectScmStats: new widget for project to display SCM stats
(TrivialDev)
+* Projects Page: add paging system in full_list and tag_cloud subpages
(TrivialDev)
+* SearchEngine: support only FTI queries (TrivialDev)
* Search: index project tags and use them for search (Roland Mas)
* Search: provide language-specific settings for better indexation/search
(Roland Mas)
+* Site Admin: add paging system in userlist page [#799] (TrivialDev)
+* Site Admin: support widgets for forge home page (TrivialDev)
+* Spellcheck (Anders Jonsson)
+* Web UI: upgrade splitter jquery plugin to 0.20.0 (TrivialDev)
+* Web UI: upgrade jquery ui to 1.11.4 (TrivialDev)
+* Widget MySystasks: new widget for user to display systasks perform on user
projects (TrivialDev)
+* Widget ProjectScmStats: new widget for project to display SCM stats
(TrivialDev)
FusionForge 6.0.5:
* Plugin SCM SVN: fix activity when SVN repository is private [#813]
(TrivialDev)
diff --git a/src/vendor/jquery-splitter/css/jquery.splitter.css
b/src/vendor/jquery-splitter/css/jquery.splitter.css
index 880f4cc..41f27ca 100644
--- a/src/vendor/jquery-splitter/css/jquery.splitter.css
+++ b/src/vendor/jquery-splitter/css/jquery.splitter.css
@@ -11,14 +11,18 @@
background-color: grey;
cursor: col-resize;
z-index:900;
- width: 4px;
+ width: 7px;
}
.splitter_panel .hsplitter {
background-color: #5F5F5F;
cursor: row-resize;
z-index: 800;
- height: 4px;
+ height: 7px;
+}
+.splitter_panel .vsplitter.splitter-invisible,
+.splitter_panel .hsplitter.splitter-invisible {
+ background: none;
}
.splitter_panel .vsplitter, .splitter_panel .left_panel, .splitter_panel
.right_panel,
.splitter_panel .hsplitter, .splitter_panel .top_panel, .splitter_panel
.bottom_panel {
@@ -42,4 +46,12 @@
}
.splitter_panel .right_panel {
right: 0;
-}
\ No newline at end of file
+}
+.splitterMask {
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1000;
+}
diff --git a/src/vendor/jquery-splitter/js/jquery.splitter-0.8.0.js
b/src/vendor/jquery-splitter/js/jquery.splitter-0.20.0.js
similarity index 64%
rename from src/vendor/jquery-splitter/js/jquery.splitter-0.8.0.js
rename to src/vendor/jquery-splitter/js/jquery.splitter-0.20.0.js
index d03e08e..5fe6cfe 100644
--- a/src/vendor/jquery-splitter/js/jquery.splitter-0.8.0.js
+++ b/src/vendor/jquery-splitter/js/jquery.splitter-0.20.0.js
@@ -1,6 +1,6 @@
/*!
* JQuery Spliter Plugin
- * Copyright (C) 2010-2013 Jakub Jankiewicz <http://jcubic.pl>
+ * Copyright (C) 2010-2016 Jakub Jankiewicz <http://jcubic.pl>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -31,10 +31,12 @@
limit: 100,
orientation: 'horizontal',
position: '50%',
+ invisible: false,
onDragStart: $.noop,
onDragEnd: $.noop,
onDrag: $.noop
}, options || {});
+ this.settings = settings;
var cls;
var children = this.children();
if (settings.orientation == 'vertical') {
@@ -42,17 +44,20 @@
panel_2 = panel_1.next().addClass('right_panel');
cls = 'vsplitter';
} else if (settings.orientation == 'horizontal') {
- panel_1 = children.first().addClass('top_panel')
+ panel_1 = children.first().addClass('top_panel');
panel_2 = panel_1.next().addClass('bottom_panel');
cls = 'hsplitter';
}
+ if (settings.invisible) {
+ cls += ' splitter-invisible';
+ }
var width = this.width();
var height = this.height();
var id = count++;
this.addClass('splitter_panel');
- var splitter = $('<div/>').addClass(cls).mouseenter(function() {
+ var splitter = $('<div/>').addClass(cls).bind('mouseenter touchstart',
function() {
splitter_id = id;
- }).mouseleave(function() {
+ }).bind('mouseleave touchend', function() {
splitter_id = null;
}).insertAfter(panel_1);
var position;
@@ -61,7 +66,7 @@
if (typeof position === 'number') {
return position;
} else if (typeof position === 'string') {
- var match = position.match(/^([0-9]+)(px|%)$/);
+ var match = position.match(/^([0-9\.]+)(px|%)$/);
if (match) {
if (match[2] == 'px') {
return +match[1];
@@ -97,12 +102,20 @@
return position;
} else {
position = get_position(n);
- var sw = splitter.width()/2;
- splitter.css('left', position-sw);
- panel_1.width(position-sw);
- panel_2.width(self.width()-position-sw);
+ var sw = splitter.width();
+ var sw2 = sw/2, pw;
+ if (settings.invisible) {
+ pw = panel_1.width(position).outerWidth();
+ panel_2.width(self.width()-pw);
+ splitter.css('left', pw-sw2);
+ } else {
+ pw = panel_1.width(position-sw2).outerWidth();
+ panel_2.width(self.width()-pw-sw);
+ splitter.css('left', pw);
+ }
}
if (!silent) {
+ self.trigger('splitter.resize');
self.find('.splitter_panel').trigger('splitter.resize');
}
return self;
@@ -113,12 +126,20 @@
return position;
} else {
position = get_position(n);
- var sw = splitter.height()/2;
- splitter.css('top', position-sw);
- panel_1.height(position-sw);
- panel_2.height(self.height()-position-sw);
+ var sw = splitter.height();
+ var sw2 = sw/2, pw;
+ if (settings.invisible) {
+ pw = panel_1.height(position).outerHeight();
+ panel_2.height(self.height()-pw);
+ splitter.css('top', pw-sw2);
+ } else {
+ pw =
panel_1.height(position-sw2).outerHeight();
+ panel_2.height(self.height()-pw-sw);
+ splitter.css('top', pw);
+ }
}
if (!silent) {
+ self.trigger('splitter.resize');
self.find('.splitter_panel').trigger('splitter.resize');
}
return self;
@@ -136,6 +157,11 @@
self.removeClass('splitter_panel');
splitter.unbind('mouseenter');
splitter.unbind('mouseleave');
+ splitter.unbind('touchstart');
+ splitter.unbind('touchmove');
+ splitter.unbind('touchend');
+ splitter.unbind('touchleave');
+ splitter.unbind('touchcancel');
if (settings.orientation == 'vertical') {
panel_1.removeClass('left_panel');
panel_2.removeClass('right_panel');
@@ -144,9 +170,12 @@
panel_2.removeClass('bottom_panel');
}
self.unbind('splitter.resize');
+ self.trigger('splitter.resize');
self.find('.splitter_panel').trigger('splitter.resize');
- splitters[id] = null;
+ splitters[i] = null;
+ count--;
splitter.remove();
+ self.removeData('splitter');
var not_null = false;
for (var i=splitters.length; i--;) {
if (splitters[i] !== null) {
@@ -159,21 +188,23 @@
$(document.documentElement).unbind('.splitter');
$(window).unbind('resize.splitter');
splitters = [];
+ count = 0;
}
}
});
self.bind('splitter.resize', function(e) {
var pos = self.position();
- if (self.orientation == 'vertical' &&
+ if (self.orientation == 'vertical' &&
pos > self.width()) {
pos = self.width() - self.limit-1;
- } else if (self.orientation == 'horizontal' &&
+ } else if (self.orientation == 'horizontal' &&
pos > self.height()) {
pos = self.height() - self.limit-1;
}
if (pos < self.limit) {
pos = self.limit + 1;
}
+ e.stopPropagation();
self.position(pos, true);
});
//inital position of splitter
@@ -196,67 +227,80 @@
pos = settings.limit;
}
self.position(pos, true);
- if (splitters.length == 0) { // first time bind events to document
+ if (splitters.length === 0) { // first time bind events to document
$(window).bind('resize.splitter', function() {
$.each(splitters, function(i, splitter) {
- splitter.refresh();
+ if (splitter) {
+ splitter.refresh();
+ }
});
});
- $(document.documentElement).bind('mousedown.splitter', function(e)
{
+ $(document.documentElement).on('mousedown.splitter
touchstart.splitter', function(e) {
if (splitter_id !== null) {
current_splitter = splitters[splitter_id];
- $('<div
class="splitterMask"></div>').insertAfter(current_splitter);
- if (current_splitter.orientation == 'horizontal') {
- $('body').css('cursor', 'row-resize');
- } else if (current_splitter.orientation == 'vertical') {
- $('body').css('cursor', 'col-resize');
- }
- settings.onDragStart(e);
- return false;
+ setTimeout(function() {
+ $('<div class="splitterMask"></div>').
+ css('cursor',
current_splitter.children().eq(1).css('cursor')).
+ insertAfter(current_splitter);
+ });
+ current_splitter.settings.onDragStart(e);
+ }
+ }).bind('mouseup.splitter touchend.splitter touchleave.splitter
touchcancel.splitter', function(e) {
+ if (current_splitter) {
+ setTimeout(function() {
+ $('.splitterMask').remove();
+ });
+ current_splitter.settings.onDragEnd(e);
+ current_splitter = null;
}
- }).bind('mouseup.splitter', function(e) {
- $('.splitterMask').remove();
- current_splitter = null;
- $('body').css('cursor', 'auto');
- settings.onDragEnd(e);
- }).bind('mousemove.splitter', function(e) {
+ }).bind('mousemove.splitter touchmove.splitter', function(e) {
if (current_splitter !== null) {
var limit = current_splitter.limit;
var offset = current_splitter.offset();
if (current_splitter.orientation == 'vertical') {
- var x = e.pageX - offset.left;
- if(x <= current_splitter.limit) {
- x = current_splitter.limit + 1;
+ var pageX = e.pageX;
+ if(e.originalEvent && e.originalEvent.changedTouches){
+ pageX = e.originalEvent.changedTouches[0].pageX;
}
- else if (x >= current_splitter.width() - limit) {
+ var x = pageX - offset.left;
+ if (x <= current_splitter.limit) {
+ x = current_splitter.limit + 1;
+ } else if (x >= current_splitter.width() - limit) {
x = current_splitter.width() - limit - 1;
}
if (x > current_splitter.limit &&
x < current_splitter.width()-limit) {
current_splitter.position(x, true);
-
current_splitter.find('.splitter_panel').trigger('splitter.resize');
- return false;
+ current_splitter.trigger('splitter.resize');
+ current_splitter.find('.splitter_panel').
+ trigger('splitter.resize');
+ //e.preventDefault();
}
} else if (current_splitter.orientation == 'horizontal') {
- var y = e.pageY-offset.top;
- if(y <= current_splitter.limit) {
- y = current_splitter.limit + 1;
+ var pageY = e.pageY;
+ if(e.originalEvent && e.originalEvent.changedTouches){
+ pageY = e.originalEvent.changedTouches[0].pageY;
}
- else if (y >= current_splitter.height() - limit) {
+ var y = pageY-offset.top;
+ if (y <= current_splitter.limit) {
+ y = current_splitter.limit + 1;
+ } else if (y >= current_splitter.height() - limit) {
y = current_splitter.height() - limit - 1;
}
if (y > current_splitter.limit &&
y < current_splitter.height()-limit) {
current_splitter.position(y, true);
current_splitter.trigger('splitter.resize');
- return false;
+ current_splitter.find('.splitter_panel').
+ trigger('splitter.resize');
+ //e.preventDefault();
}
}
- settings.onDrag(e);
+ current_splitter.settings.onDrag(e);
}
- });
+ });//*/
}
- splitters.push(self);
+ splitters[id] = self;
self.data('splitter', self);
return self;
};
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index 850b352..0000000
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png and
/dev/null differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
deleted file mode 100644
index 79af25a..0000000
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png and
/dev/null differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
deleted file mode 100644
index 80eff10..0000000
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png and
/dev/null differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
deleted file mode 100644
index 69ea158..0000000
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png and
/dev/null differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
index ee7422d..33337d5 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
index d040050..0f4eadd 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
index b3e3f02..b5eabe5 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
index 2e2e5fa..c75840d 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
and
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
index 16d682b..607fe9d 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
and
b/src/vendor/jquery-ui/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_3383bb_256x240.png
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_3383bb_256x240.png
index c2eb45b..956671a 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_3383bb_256x240.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_3383bb_256x240.png differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_454545_256x240.png
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_454545_256x240.png
index b6db1ac..d6169e8 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_454545_256x240.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_454545_256x240.png differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_70b2e1_256x240.png
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_70b2e1_256x240.png
index 66f4f00..12880a4 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_70b2e1_256x240.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_70b2e1_256x240.png differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_999999_256x240.png
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_999999_256x240.png
index da7e727..e6763f1 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_999999_256x240.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_999999_256x240.png differ
diff --git
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_fbc856_256x240.png
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_fbc856_256x240.png
index 69480ef..40f5283 100644
Binary files
a/src/vendor/jquery-ui/css/overcast/images/ui-icons_fbc856_256x240.png and
b/src/vendor/jquery-ui/css/overcast/images/ui-icons_fbc856_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/overcast/jquery-ui-1.11.2.css
b/src/vendor/jquery-ui/css/overcast/jquery-ui-1.11.4.css
similarity index 98%
rename from src/vendor/jquery-ui/css/overcast/jquery-ui-1.11.2.css
rename to src/vendor/jquery-ui/css/overcast/jquery-ui-1.11.4.css
index 894c384..1782a4d 100644
--- a/src/vendor/jquery-ui/css/overcast/jquery-ui-1.11.2.css
+++ b/src/vendor/jquery-ui/css/overcast/jquery-ui-1.11.4.css
@@ -1,8 +1,8 @@
-/*! jQuery UI - v1.11.2 - 2015-02-01
+/*! jQuery UI - v1.11.4 - 2016-05-16
* http://jqueryui.com
* Includes: core.css, draggable.css, resizable.css, selectable.css,
sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css,
dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css,
tabs.css, tooltip.css, theme.css
* To view and modify this theme, visit
http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CHelvetica%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=dddddd&bgTextureHeader=glass&bgImgOpacityHeader=35&borderColorHeader=bbbbbb&fcHeader=444444&iconColorHeader=999999&bgColorContent=c9c9c9&bgTextureContent=inset_soft&bgImgOpacityContent=50&borderColorContent=aaaaaa&fcContent=333333&iconColorContent=999999&bgColorDefault=eeeeee&bgTextureDefault=glass&bgImgOpacityDefault=60&borderColorDefault=cccccc&fcDefault=3383bb&iconColorDefault=70b2e1&bgColorHover=f8f8f8&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=bbbbbb&fcHover=599fcf&iconColorHover=3383bb&bgColorActive=999999&bgTextureActive=inset_hard&bgImgOpacityActive=75&borderColorActive=999999&fcActive=ffffff&iconColorActive=454545&bgColorHighlight=eeeeee&bgTextureHighlight=flat&bgImgOpacityHighlight=55&borderColorHighlight=ffffff&fcHighlight=444444&iconColorHighlight=3383bb&bgColorError=c0402a&bgTextureError=flat&bgImgOpacityError=55&borderColorError=c0402a&fcError=ffffff&iconColorError=fbc856&bgColorOverlay=eeeeee&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=80&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=60&thicknessShadow=4px&offsetTopShadow=-4px&offsetLeftShadow=-4px&cornerRadiusShadow=0px
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
/* Layout helpers
----------------------------------*/
@@ -920,7 +920,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #ffffff;
- background: #eeeeee url("images/ui-bg_flat_55_eeeeee_40x100.png") 50%
50% repeat-x;
+ background: #eeeeee;
color: #444444;
}
.ui-state-highlight a,
@@ -932,7 +932,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
border: 1px solid #c0402a;
- background: #c0402a url("images/ui-bg_flat_55_c0402a_40x100.png") 50%
50% repeat-x;
+ background: #c0402a;
color: #ffffff;
}
.ui-state-error a,
@@ -1211,14 +1211,14 @@ body .ui-tooltip {
/* Overlays */
.ui-widget-overlay {
- background: #eeeeee url("images/ui-bg_flat_0_eeeeee_40x100.png") 50%
50% repeat-x;
+ background: #eeeeee;
opacity: .8;
filter: Alpha(Opacity=80); /* support: IE8 */
}
.ui-widget-shadow {
margin: -4px 0 0 -4px;
padding: 4px;
- background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50%
50% repeat-x;
+ background: #aaaaaa;
opacity: .6;
filter: Alpha(Opacity=60); /* support: IE8 */
border-radius: 0px;
diff --git a/src/vendor/jquery-ui/css/sunny/jquery-ui.structure-1.11.2.css
b/src/vendor/jquery-ui/css/overcast/jquery-ui.structure-1.11.4.css
similarity index 99%
rename from src/vendor/jquery-ui/css/sunny/jquery-ui.structure-1.11.2.css
rename to src/vendor/jquery-ui/css/overcast/jquery-ui.structure-1.11.4.css
index d3d88d4..8184e15 100644
--- a/src/vendor/jquery-ui/css/sunny/jquery-ui.structure-1.11.2.css
+++ b/src/vendor/jquery-ui/css/overcast/jquery-ui.structure-1.11.4.css
@@ -1,8 +1,8 @@
/*!
- * jQuery UI CSS Framework 1.11.2
+ * jQuery UI CSS Framework 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
diff --git a/src/vendor/jquery-ui/css/overcast/jquery-ui.theme-1.11.2.css
b/src/vendor/jquery-ui/css/overcast/jquery-ui.theme-1.11.4.css
similarity index 97%
rename from src/vendor/jquery-ui/css/overcast/jquery-ui.theme-1.11.2.css
rename to src/vendor/jquery-ui/css/overcast/jquery-ui.theme-1.11.4.css
index 5e7516e..aa2d0c6 100644
--- a/src/vendor/jquery-ui/css/overcast/jquery-ui.theme-1.11.2.css
+++ b/src/vendor/jquery-ui/css/overcast/jquery-ui.theme-1.11.4.css
@@ -1,8 +1,8 @@
/*!
- * jQuery UI CSS Framework 1.11.2
+ * jQuery UI CSS Framework 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -105,7 +105,7 @@
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #ffffff;
- background: #eeeeee url("images/ui-bg_flat_55_eeeeee_40x100.png") 50%
50% repeat-x;
+ background: #eeeeee;
color: #444444;
}
.ui-state-highlight a,
@@ -117,7 +117,7 @@
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
border: 1px solid #c0402a;
- background: #c0402a url("images/ui-bg_flat_55_c0402a_40x100.png") 50%
50% repeat-x;
+ background: #c0402a;
color: #ffffff;
}
.ui-state-error a,
@@ -396,14 +396,14 @@
/* Overlays */
.ui-widget-overlay {
- background: #eeeeee url("images/ui-bg_flat_0_eeeeee_40x100.png") 50%
50% repeat-x;
+ background: #eeeeee;
opacity: .8;
filter: Alpha(Opacity=80); /* support: IE8 */
}
.ui-widget-shadow {
margin: -4px 0 0 -4px;
padding: 4px;
- background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50%
50% repeat-x;
+ background: #aaaaaa;
opacity: .6;
filter: Alpha(Opacity=60); /* support: IE8 */
border-radius: 0px;
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png
index 34467e0..a439f79 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png
and
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png
differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_30_cccccc_40x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_30_cccccc_40x100.png
deleted file mode 100644
index 7f14936..0000000
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_30_cccccc_40x100.png and
/dev/null differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png
deleted file mode 100644
index e5ea322..0000000
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png and
/dev/null differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png
index 578fa09..f4e869b 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png
and
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png
differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png
index 3af5cd3..809bb94 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png
and
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png
differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png
index bdd8983..eec82eb 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png
and
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png
differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png
index 56dfc2b..feb7d5c 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png
and
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png
differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png
index 4e784d7..3521287 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png
and
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png
differ
diff --git
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png
index 6cd317a..be3f45e 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png
and
b/src/vendor/jquery-ui/css/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png
differ
diff --git a/src/vendor/jquery-ui/css/sunny/images/ui-icons_3d3d3d_256x240.png
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_3d3d3d_256x240.png
index 52e7fb9..d00bb69 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-icons_3d3d3d_256x240.png and
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_3d3d3d_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/sunny/images/ui-icons_bd7b00_256x240.png
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_bd7b00_256x240.png
index 1b05bdd..cbab2f7 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-icons_bd7b00_256x240.png and
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_bd7b00_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/sunny/images/ui-icons_d19405_256x240.png
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_d19405_256x240.png
index 48de901..ab63784 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-icons_d19405_256x240.png and
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_d19405_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/sunny/images/ui-icons_eb990f_256x240.png
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_eb990f_256x240.png
index d73d5cd..5ec77c3 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-icons_eb990f_256x240.png and
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_eb990f_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/sunny/images/ui-icons_ed9f26_256x240.png
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_ed9f26_256x240.png
index 4f25c8b..8fb3933 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-icons_ed9f26_256x240.png and
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_ed9f26_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/sunny/images/ui-icons_fadc7a_256x240.png
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_fadc7a_256x240.png
index 95a4e5d..c7cf519 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-icons_fadc7a_256x240.png and
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_fadc7a_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/sunny/images/ui-icons_ffe180_256x240.png
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_ffe180_256x240.png
index c26bc29..e28b4d2 100644
Binary files
a/src/vendor/jquery-ui/css/sunny/images/ui-icons_ffe180_256x240.png and
b/src/vendor/jquery-ui/css/sunny/images/ui-icons_ffe180_256x240.png differ
diff --git a/src/vendor/jquery-ui/css/sunny/jquery-ui-1.11.2.css
b/src/vendor/jquery-ui/css/sunny/jquery-ui-1.11.4.css
similarity index 99%
rename from src/vendor/jquery-ui/css/sunny/jquery-ui-1.11.2.css
rename to src/vendor/jquery-ui/css/sunny/jquery-ui-1.11.4.css
index 2653328..8ad8274 100644
--- a/src/vendor/jquery-ui/css/sunny/jquery-ui-1.11.2.css
+++ b/src/vendor/jquery-ui/css/sunny/jquery-ui-1.11.4.css
@@ -1,8 +1,8 @@
-/*! jQuery UI - v1.11.2 - 2015-02-01
+/*! jQuery UI - v1.11.4 - 2016-05-16
* http://jqueryui.com
* Includes: core.css, draggable.css, resizable.css, selectable.css,
sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css,
dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css,
tabs.css, tooltip.css, theme.css
* To view and modify this theme, visit
http://jqueryui.com/themeroller/?ffDefault=Segoe%20UI%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=817865&bgTextureHeader=gloss_wave&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=ffffff&iconColorHeader=fadc7a&bgColorContent=feeebd&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=gloss_wave&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=gloss_wave&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=inset_soft&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=gloss_wave&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=diagonals_medium&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=flat&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=flat&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
/* Layout helpers
----------------------------------*/
@@ -1211,14 +1211,14 @@ body .ui-tooltip {
/* Overlays */
.ui-widget-overlay {
- background: #5c5c5c url("images/ui-bg_flat_50_5c5c5c_40x100.png") 50%
50% repeat-x;
+ background: #5c5c5c;
opacity: .8;
filter: Alpha(Opacity=80); /* support: IE8 */
}
.ui-widget-shadow {
margin: -7px 0 0 -7px;
padding: 7px;
- background: #cccccc url("images/ui-bg_flat_30_cccccc_40x100.png") 50%
50% repeat-x;
+ background: #cccccc;
opacity: .6;
filter: Alpha(Opacity=60); /* support: IE8 */
border-radius: 8px;
diff --git a/src/vendor/jquery-ui/css/overcast/jquery-ui.structure-1.11.2.css
b/src/vendor/jquery-ui/css/sunny/jquery-ui.structure-1.11.4.css
similarity index 99%
rename from src/vendor/jquery-ui/css/overcast/jquery-ui.structure-1.11.2.css
rename to src/vendor/jquery-ui/css/sunny/jquery-ui.structure-1.11.4.css
index d3d88d4..8184e15 100644
--- a/src/vendor/jquery-ui/css/overcast/jquery-ui.structure-1.11.2.css
+++ b/src/vendor/jquery-ui/css/sunny/jquery-ui.structure-1.11.4.css
@@ -1,8 +1,8 @@
/*!
- * jQuery UI CSS Framework 1.11.2
+ * jQuery UI CSS Framework 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
diff --git a/src/vendor/jquery-ui/css/sunny/jquery-ui.theme-1.11.2.css
b/src/vendor/jquery-ui/css/sunny/jquery-ui.theme-1.11.4.css
similarity index 98%
rename from src/vendor/jquery-ui/css/sunny/jquery-ui.theme-1.11.2.css
rename to src/vendor/jquery-ui/css/sunny/jquery-ui.theme-1.11.4.css
index fc32db6..2405d5f 100644
--- a/src/vendor/jquery-ui/css/sunny/jquery-ui.theme-1.11.2.css
+++ b/src/vendor/jquery-ui/css/sunny/jquery-ui.theme-1.11.4.css
@@ -1,8 +1,8 @@
/*!
- * jQuery UI CSS Framework 1.11.2
+ * jQuery UI CSS Framework 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -396,14 +396,14 @@
/* Overlays */
.ui-widget-overlay {
- background: #5c5c5c url("images/ui-bg_flat_50_5c5c5c_40x100.png") 50%
50% repeat-x;
+ background: #5c5c5c;
opacity: .8;
filter: Alpha(Opacity=80); /* support: IE8 */
}
.ui-widget-shadow {
margin: -7px 0 0 -7px;
padding: 7px;
- background: #cccccc url("images/ui-bg_flat_30_cccccc_40x100.png") 50%
50% repeat-x;
+ background: #cccccc;
opacity: .6;
filter: Alpha(Opacity=60); /* support: IE8 */
border-radius: 8px;
diff --git a/src/vendor/jquery-ui/js/jquery-ui-1.11.2.js
b/src/vendor/jquery-ui/js/jquery-ui-1.11.4.js
similarity index 97%
rename from src/vendor/jquery-ui/js/jquery-ui-1.11.2.js
rename to src/vendor/jquery-ui/js/jquery-ui-1.11.4.js
index 37032bb..dbeb860 100644
--- a/src/vendor/jquery-ui/js/jquery-ui-1.11.2.js
+++ b/src/vendor/jquery-ui/js/jquery-ui-1.11.4.js
@@ -1,7 +1,7 @@
-/*! jQuery UI - v1.11.2 - 2015-01-25
+/*! jQuery UI - v1.11.4 - 2016-05-15
* http://jqueryui.com
* Includes: core.js, widget.js, mouse.js, position.js, draggable.js,
droppable.js, resizable.js, selectable.js, sortable.js, accordion.js,
autocomplete.js, button.js, datepicker.js, dialog.js, menu.js, progressbar.js,
selectmenu.js, slider.js, spinner.js, tabs.js, tooltip.js, effect.js,
effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js,
effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js,
effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js,
effect-size.js, effect-slide.js, effect-transfer.js
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
(function( factory ) {
if ( typeof define === "function" && define.amd ) {
@@ -15,10 +15,10 @@
}
}(function( $ ) {
/*!
- * jQuery UI Core 1.11.2
+ * jQuery UI Core 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -30,7 +30,7 @@
$.ui = $.ui || {};
$.extend( $.ui, {
- version: "1.11.2",
+ version: "1.11.4",
keyCode: {
BACKSPACE: 8,
@@ -103,7 +103,7 @@ function focusable( element, isTabIndexNotNaN ) {
img = $( "img[usemap='#" + mapName + "']" )[ 0 ];
return !!img && visible( img );
}
- return ( /input|select|textarea|button|object/.test( nodeName ) ?
+ return ( /^(input|select|textarea|button|object)$/.test( nodeName ) ?
!element.disabled :
"a" === nodeName ?
element.href || isTabIndexNotNaN :
@@ -309,10 +309,10 @@ $.ui.plugin = {
/*!
- * jQuery UI Widget 1.11.2
+ * jQuery UI Widget 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -490,11 +490,6 @@ $.widget.bridge = function( name, object ) {
args = widget_slice.call( arguments, 1 ),
returnValue = this;
- // allow multiple hashes to be passed on init
- options = !isMethodCall && args.length ?
- $.widget.extend.apply( null, [ options ].concat(args) )
:
- options;
-
if ( isMethodCall ) {
this.each(function() {
var methodValue,
@@ -519,6 +514,12 @@ $.widget.bridge = function( name, object ) {
}
});
} else {
+
+ // Allow multiple hashes to be passed on init
+ if ( args.length ) {
+ options = $.widget.extend.apply( null, [
options ].concat(args) );
+ }
+
this.each(function() {
var instance = $.data( this, fullName );
if ( instance ) {
@@ -856,10 +857,10 @@ var widget = $.widget;
/*!
- * jQuery UI Mouse 1.11.2
+ * jQuery UI Mouse 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -873,7 +874,7 @@ $( document ).mouseup( function() {
});
var mouse = $.widget("ui.mouse", {
- version: "1.11.2",
+ version: "1.11.4",
options: {
cancel: "input,textarea,button,select,option",
distance: 1,
@@ -1042,10 +1043,10 @@ var mouse = $.widget("ui.mouse", {
/*!
- * jQuery UI Position 1.11.2
+ * jQuery UI Position 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -1481,12 +1482,12 @@ $.ui.position = {
newOverBottom;
if ( overTop < 0 ) {
newOverBottom = position.top + myOffset +
atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
- if ( ( position.top + myOffset + atOffset +
offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
+ if ( newOverBottom < 0 || newOverBottom < abs(
overTop ) ) {
position.top += myOffset + atOffset +
offset;
}
} else if ( overBottom > 0 ) {
newOverTop = position.top -
data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
- if ( ( position.top + myOffset + atOffset +
offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
+ if ( newOverTop > 0 || abs( newOverTop ) <
overBottom ) {
position.top += myOffset + atOffset +
offset;
}
}
@@ -1549,10 +1550,10 @@ var position = $.ui.position;
/*!
- * jQuery UI Draggable 1.11.2
+ * jQuery UI Draggable 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -1561,7 +1562,7 @@ var position = $.ui.position;
$.widget("ui.draggable", $.ui.mouse, {
- version: "1.11.2",
+ version: "1.11.4",
widgetEventPrefix: "drag",
options: {
addClasses: true,
@@ -2335,6 +2336,9 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
if ( !sortable.isOver ) {
sortable.isOver = 1;
+ // Store draggable's parent in case we
need to reappend to it later.
+ draggable._parent = ui.helper.parent();
+
sortable.currentItem = ui.helper
.appendTo( sortable.element )
.data( "ui-sortable-item", true
);
@@ -2411,8 +2415,9 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
sortable.placeholder.remove();
}
- // Recalculate the draggable's offset
considering the sortable
- // may have modified them in unexpected
ways (#8809)
+ // Restore and recalculate the
draggable's offset considering the sortable
+ // may have modified them in unexpected
ways. (#8809, #10669)
+ ui.helper.appendTo( draggable._parent );
draggable._refreshOffsets( event );
ui.position =
draggable._generatePosition( event, true );
@@ -2662,10 +2667,10 @@ var draggable = $.ui.draggable;
/*!
- * jQuery UI Droppable 1.11.2
+ * jQuery UI Droppable 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -2674,7 +2679,7 @@ var draggable = $.ui.draggable;
$.widget( "ui.droppable", {
- version: "1.11.2",
+ version: "1.11.4",
widgetEventPrefix: "drop",
options: {
accept: "*",
@@ -3059,10 +3064,10 @@ var droppable = $.ui.droppable;
/*!
- * jQuery UI Resizable 1.11.2
+ * jQuery UI Resizable 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -3071,7 +3076,7 @@ var droppable = $.ui.droppable;
$.widget("ui.resizable", $.ui.mouse, {
- version: "1.11.2",
+ version: "1.11.4",
widgetEventPrefix: "resize",
options: {
alsoResize: false,
@@ -3144,7 +3149,7 @@ $.widget("ui.resizable", $.ui.mouse, {
});
// Wrap the element if it cannot hold child nodes
- if
(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+ if
(this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i))
{
this.element.wrap(
$("<div class='ui-wrapper' style='overflow:
hidden;'></div>").css({
@@ -3205,7 +3210,8 @@ $.widget("ui.resizable", $.ui.mouse, {
nw: ".ui-resizable-nw"
} );
- if (this.handles.constructor === String) {
+ this._handles = $();
+ if ( this.handles.constructor === String ) {
if ( this.handles === "all") {
this.handles = "n,e,s,w,se,sw,ne,nw";
@@ -3243,9 +3249,12 @@ $.widget("ui.resizable", $.ui.mouse, {
if (this.handles[i].constructor === String) {
this.handles[i] =
this.element.children( this.handles[ i ] ).first().show();
+ } else if ( this.handles[ i ].jquery ||
this.handles[ i ].nodeType ) {
+ this.handles[ i ] = $( this.handles[ i
] );
+ this._on( this.handles[ i ], {
"mousedown": that._mouseDown });
}
- if (this.elementIsWrapper &&
this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+ if (this.elementIsWrapper &&
this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)) {
axis = $(this.handles[i], this.element);
@@ -3259,21 +3268,17 @@ $.widget("ui.resizable", $.ui.mouse, {
target.css(padPos, padWrapper);
this._proportionallyResize();
-
}
- // TODO: What's that good for? There's not
anything to be executed left
- if (!$(this.handles[i]).length) {
- continue;
- }
+ this._handles = this._handles.add(
this.handles[ i ] );
}
};
// TODO: make renderAxis a prototype function
this._renderAxis(this.element);
- this._handles = $(".ui-resizable-handle", this.element)
- .disableSelection();
+ this._handles = this._handles.add( this.element.find(
".ui-resizable-handle" ) );
+ this._handles.disableSelection();
this._handles.mouseover(function() {
if (!that.resizing) {
@@ -3307,7 +3312,6 @@ $.widget("ui.resizable", $.ui.mouse, {
}
this._mouseInit();
-
},
_destroy: function() {
@@ -3988,7 +3992,7 @@ $.ui.plugin.add( "resizable", "containment", {
}
}
- if ( !continueResize ){
+ if ( !continueResize ) {
that.position.left = that.prevPosition.left;
that.position.top = that.prevPosition.top;
that.size.width = that.prevSize.width;
@@ -4029,29 +4033,15 @@ $.ui.plugin.add("resizable", "alsoResize", {
start: function() {
var that = $(this).resizable( "instance" ),
- o = that.options,
- _store = function(exp) {
- $(exp).each(function() {
- var el = $(this);
- el.data("ui-resizable-alsoresize", {
- width: parseInt(el.width(),
10), height: parseInt(el.height(), 10),
- left: parseInt(el.css("left"),
10), top: parseInt(el.css("top"), 10)
- });
- });
- };
+ o = that.options;
- if (typeof(o.alsoResize) === "object" &&
!o.alsoResize.parentNode) {
- if (o.alsoResize.length) {
- o.alsoResize = o.alsoResize[0];
- _store(o.alsoResize);
- } else {
- $.each(o.alsoResize, function(exp) {
- _store(exp);
- });
- }
- } else {
- _store(o.alsoResize);
- }
+ $(o.alsoResize).each(function() {
+ var el = $(this);
+ el.data("ui-resizable-alsoresize", {
+ width: parseInt(el.width(), 10), height:
parseInt(el.height(), 10),
+ left: parseInt(el.css("left"), 10), top:
parseInt(el.css("top"), 10)
+ });
+ });
},
resize: function(event, ui) {
@@ -4064,35 +4054,23 @@ $.ui.plugin.add("resizable", "alsoResize", {
width: (that.size.width - os.width) || 0,
top: (that.position.top - op.top) || 0,
left: (that.position.left - op.left) || 0
- },
+ };
- _alsoResize = function(exp, c) {
- $(exp).each(function() {
- var el = $(this), start =
$(this).data("ui-resizable-alsoresize"), style = {},
- css = c && c.length ?
- c :
-
el.parents(ui.originalElement[0]).length ?
- [ "width",
"height" ] :
- [ "width",
"height", "top", "left" ];
-
- $.each(css, function(i, prop) {
- var sum = (start[prop] || 0) +
(delta[prop] || 0);
- if (sum && sum >= 0) {
- style[prop] = sum ||
null;
- }
- });
+ $(o.alsoResize).each(function() {
+ var el = $(this), start =
$(this).data("ui-resizable-alsoresize"), style = {},
+ css =
el.parents(ui.originalElement[0]).length ?
+ [ "width", "height" ] :
+ [ "width", "height",
"top", "left" ];
- el.css(style);
+ $.each(css, function(i, prop) {
+ var sum = (start[prop] || 0) +
(delta[prop] || 0);
+ if (sum && sum >= 0) {
+ style[prop] = sum || null;
+ }
});
- };
- if (typeof(o.alsoResize) === "object" &&
!o.alsoResize.nodeType) {
- $.each(o.alsoResize, function(exp, c) {
- _alsoResize(exp, c);
+ el.css(style);
});
- } else {
- _alsoResize(o.alsoResize);
- }
},
stop: function() {
@@ -4210,7 +4188,7 @@ $.ui.plugin.add("resizable", "grid", {
that.size.width = newWidth;
that.position.left = op.left - ox;
} else {
- newWidth = gridY - outerDimensions.height;
+ newWidth = gridX - outerDimensions.width;
that.size.width = newWidth;
that.position.left = op.left + os.width -
newWidth;
}
@@ -4223,10 +4201,10 @@ var resizable = $.ui.resizable;
/*!
- * jQuery UI Selectable 1.11.2
+ * jQuery UI Selectable 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -4235,7 +4213,7 @@ var resizable = $.ui.resizable;
var selectable = $.widget("ui.selectable", $.ui.mouse, {
- version: "1.11.2",
+ version: "1.11.4",
options: {
appendTo: "body",
autoRefresh: true,
@@ -4495,10 +4473,10 @@ var selectable = $.widget("ui.selectable", $.ui.mouse, {
/*!
- * jQuery UI Sortable 1.11.2
+ * jQuery UI Sortable 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -4507,7 +4485,7 @@ var selectable = $.widget("ui.selectable", $.ui.mouse, {
var sortable = $.widget("ui.sortable", $.ui.mouse, {
- version: "1.11.2",
+ version: "1.11.4",
widgetEventPrefix: "sort",
ready: false,
options: {
@@ -4558,17 +4536,12 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
},
_create: function() {
-
- var o = this.options;
this.containerCache = {};
this.element.addClass("ui-sortable");
//Get the items
this.refresh();
- //Let's determine if the items are being displayed horizontally
- this.floating = this.items.length ? o.axis === "x" ||
this._isFloating(this.items[0].item) : false;
-
//Let's determine the parent's offset
this.offset = this.element.offset();
@@ -4757,7 +4730,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
}
//Prepare scrolling
- if(this.scrollParent[0] !== document &&
this.scrollParent[0].tagName !== "HTML") {
+ if(this.scrollParent[0] !== this.document[0] &&
this.scrollParent[0].tagName !== "HTML") {
this.overflowOffset = this.scrollParent.offset();
}
@@ -4809,7 +4782,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
//Do scrolling
if(this.options.scroll) {
- if(this.scrollParent[0] !== document &&
this.scrollParent[0].tagName !== "HTML") {
+ if(this.scrollParent[0] !== this.document[0] &&
this.scrollParent[0].tagName !== "HTML") {
if((this.overflowOffset.top +
this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
this.scrollParent[0].scrollTop =
scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
@@ -4825,16 +4798,16 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
} else {
- if(event.pageY - $(document).scrollTop() <
o.scrollSensitivity) {
- scrolled =
$(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
- } else if($(window).height() - (event.pageY -
$(document).scrollTop()) < o.scrollSensitivity) {
- scrolled =
$(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+ if(event.pageY - this.document.scrollTop() <
o.scrollSensitivity) {
+ scrolled =
this.document.scrollTop(this.document.scrollTop() - o.scrollSpeed);
+ } else if(this.window.height() - (event.pageY -
this.document.scrollTop()) < o.scrollSensitivity) {
+ scrolled =
this.document.scrollTop(this.document.scrollTop() + o.scrollSpeed);
}
- if(event.pageX - $(document).scrollLeft() <
o.scrollSensitivity) {
- scrolled =
$(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
- } else if($(window).width() - (event.pageX -
$(document).scrollLeft()) < o.scrollSensitivity) {
- scrolled =
$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+ if(event.pageX - this.document.scrollLeft() <
o.scrollSensitivity) {
+ scrolled =
this.document.scrollLeft(this.document.scrollLeft() - o.scrollSpeed);
+ } else if(this.window.width() - (event.pageX -
this.document.scrollLeft()) < o.scrollSensitivity) {
+ scrolled =
this.document.scrollLeft(this.document.scrollLeft() + o.scrollSpeed);
}
}
@@ -4933,10 +4906,10 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
animation = {};
if ( !axis || axis === "x" ) {
- animation.left = cur.left -
this.offset.parent.left - this.margins.left + (this.offsetParent[0] ===
document.body ? 0 : this.offsetParent[0].scrollLeft);
+ animation.left = cur.left -
this.offset.parent.left - this.margins.left + (this.offsetParent[0] ===
this.document[0].body ? 0 : this.offsetParent[0].scrollLeft);
}
if ( !axis || axis === "y" ) {
- animation.top = cur.top -
this.offset.parent.top - this.margins.top + (this.offsetParent[0] ===
document.body ? 0 : this.offsetParent[0].scrollTop);
+ animation.top = cur.top -
this.offset.parent.top - this.margins.top + (this.offsetParent[0] ===
this.document[0].body ? 0 : this.offsetParent[0].scrollTop);
}
this.reverting = true;
$(this.helper).animate( animation,
parseInt(this.options.revert, 10) || 500, function() {
@@ -5129,7 +5102,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
if(connectWith && connected) {
for (i = connectWith.length - 1; i >= 0; i--){
- cur = $(connectWith[i]);
+ cur = $(connectWith[i], this.document[0]);
for ( j = cur.length - 1; j >= 0; j--){
inst = $.data(cur[j],
this.widgetFullName);
if(inst && inst !== this &&
!inst.options.disabled) {
@@ -5179,7 +5152,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
if(connectWith && this.ready) { //Shouldn't be run the first
time through due to massive slow-down
for (i = connectWith.length - 1; i >= 0; i--){
- cur = $(connectWith[i]);
+ cur = $(connectWith[i], this.document[0]);
for (j = cur.length - 1; j >= 0; j--){
inst = $.data(cur[j],
this.widgetFullName);
if(inst && inst !== this &&
!inst.options.disabled) {
@@ -5212,6 +5185,11 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
refreshPositions: function(fast) {
+ // Determine whether items are being displayed horizontally
+ this.floating = this.items.length ?
+ this.options.axis === "x" || this._isFloating(
this.items[ 0 ].item ) :
+ false;
+
//This has to be redone because due to the item being moved
out/into the offsetParent, the offsetParent's position will change
if(this.offsetParent && this.helper) {
this.offset.parent = this._getParentOffset();
@@ -5269,12 +5247,13 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
.addClass(className ||
that.currentItem[0].className+" ui-sortable-placeholder")
.removeClass("ui-sortable-helper");
- if ( nodeName === "tr" ) {
-
that.currentItem.children().each(function() {
- $( "<td> </td>",
that.document[0] )
- .attr(
"colspan", $( this ).attr( "colspan" ) || 1 )
- .appendTo(
element );
- });
+ if ( nodeName === "tbody" ) {
+ that._createTrPlaceholder(
+ that.currentItem.find(
"tr" ).eq( 0 ),
+ $( "<tr>",
that.document[ 0 ] ).appendTo( element )
+ );
+ } else if ( nodeName === "tr" ) {
+ that._createTrPlaceholder(
that.currentItem, element );
} else if ( nodeName === "img" ) {
element.attr( "src",
that.currentItem.attr( "src" ) );
}
@@ -5311,6 +5290,16 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
},
+ _createTrPlaceholder: function( sourceTr, targetTr ) {
+ var that = this;
+
+ sourceTr.children().each(function() {
+ $( "<td> </td>", that.document[ 0 ] )
+ .attr( "colspan", $( this ).attr( "colspan" )
|| 1 )
+ .appendTo( targetTr );
+ });
+ },
+
_contactContainers: function(event) {
var i, j, dist, itemWithLeastDistance, posProperty,
sizeProperty, cur, nearBottom, floating, axis,
innermostContainer = null,
@@ -5471,14 +5460,14 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
// 1. The position of the helper is absolute, so it's position
is calculated based on the next positioned parent
// 2. The actual offset parent is a child of the scroll parent,
and the scroll parent isn't the document, which means that
// the scroll is included in the initial calculation of the
offset of the parent, and never recalculated upon drag
- if(this.cssPosition === "absolute" && this.scrollParent[0] !==
document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+ if(this.cssPosition === "absolute" && this.scrollParent[0] !==
this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) {
po.left += this.scrollParent.scrollLeft();
po.top += this.scrollParent.scrollTop();
}
// This needs to be actually done for all browsers, since
pageX/pageY includes this information
// with an ugly IE fix
- if( this.offsetParent[0] === document.body ||
(this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() ===
"html" && $.ui.ie)) {
+ if( this.offsetParent[0] === this.document[0].body ||
(this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() ===
"html" && $.ui.ie)) {
po = { top: 0, left: 0 };
}
@@ -5528,8 +5517,8 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
this.containment = [
0 - this.offset.relative.left -
this.offset.parent.left,
0 - this.offset.relative.top -
this.offset.parent.top,
- $(o.containment === "document" ? document :
window).width() - this.helperProportions.width - this.margins.left,
- ($(o.containment === "document" ? document :
window).height() || document.body.parentNode.scrollHeight) -
this.helperProportions.height - this.margins.top
+ o.containment === "document" ?
this.document.width() : this.window.width() - this.helperProportions.width -
this.margins.left,
+ (o.containment === "document" ?
this.document.width() : this.window.height() ||
this.document[0].body.parentNode.scrollHeight) - this.helperProportions.height
- this.margins.top
];
}
@@ -5554,7 +5543,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
pos = this.position;
}
var mod = d === "absolute" ? 1 : -1,
- scroll = this.cssPosition === "absolute" &&
!(this.scrollParent[0] !== document && $.contains(this.scrollParent[0],
this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
+ scroll = this.cssPosition === "absolute" &&
!(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0],
this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
scrollIsRootNode =
(/(html|body)/i).test(scroll[0].tagName);
return {
@@ -5580,13 +5569,13 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
o = this.options,
pageX = event.pageX,
pageY = event.pageY,
- scroll = this.cssPosition === "absolute" &&
!(this.scrollParent[0] !== document && $.contains(this.scrollParent[0],
this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+ scroll = this.cssPosition === "absolute" &&
!(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0],
this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
// This is another very weird special case that only happens
for relative elements:
// 1. If the css position is relative
// 2. and the scroll parent is the document or similar to the
offset parent
// we have to refresh the relative offset during the scroll so
there are no jumps
- if(this.cssPosition === "relative" && !(this.scrollParent[0]
!== document && this.scrollParent[0] !== this.offsetParent[0])) {
+ if(this.cssPosition === "relative" && !(this.scrollParent[0]
!== this.document[0] && this.scrollParent[0] !== this.offsetParent[0])) {
this.offset.relative = this._getRelativeOffset();
}
@@ -5784,10 +5773,10 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
/*!
- * jQuery UI Accordion 1.11.2
+ * jQuery UI Accordion 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -5796,7 +5785,7 @@ var sortable = $.widget("ui.sortable", $.ui.mouse, {
var accordion = $.widget( "ui.accordion", {
- version: "1.11.2",
+ version: "1.11.4",
options: {
active: 0,
animate: {},
@@ -6254,7 +6243,10 @@ var accordion = $.widget( "ui.accordion", {
toHide.attr({
"aria-hidden": "true"
});
- toHide.prev().attr( "aria-selected", "false" );
+ toHide.prev().attr({
+ "aria-selected": "false",
+ "aria-expanded": "false"
+ });
// if we're switching panels, remove the old header from the
tab order
// if we're opening from collapsed state, remove the previous
header from the tab order
// if we're collapsing, then keep the collapsing header in the
tab order
@@ -6265,7 +6257,7 @@ var accordion = $.widget( "ui.accordion", {
});
} else if ( toShow.length ) {
this.headers.filter(function() {
- return $( this ).attr( "tabIndex" ) === 0;
+ return parseInt( $( this ).attr( "tabIndex" ),
10 ) === 0;
})
.attr( "tabIndex", -1 );
}
@@ -6275,8 +6267,8 @@ var accordion = $.widget( "ui.accordion", {
.prev()
.attr({
"aria-selected": "true",
- tabIndex: 0,
- "aria-expanded": "true"
+ "aria-expanded": "true",
+ tabIndex: 0
});
},
@@ -6284,6 +6276,7 @@ var accordion = $.widget( "ui.accordion", {
var total, easing, duration,
that = this,
adjust = 0,
+ boxSizing = toShow.css( "box-sizing" ),
down = toShow.length &&
( !toHide.length || ( toShow.index() <
toHide.index() ) ),
animate = this.options.animate || {},
@@ -6326,7 +6319,9 @@ var accordion = $.widget( "ui.accordion", {
step: function( now, fx ) {
fx.now = Math.round( now );
if ( fx.prop !== "height" ) {
- adjust += fx.now;
+ if ( boxSizing ===
"content-box" ) {
+ adjust += fx.now;
+ }
} else if ( that.options.heightStyle
!== "content" ) {
fx.now = Math.round( total -
toHide.outerHeight() - adjust );
adjust = 0;
@@ -6354,10 +6349,10 @@ var accordion = $.widget( "ui.accordion", {
/*!
- * jQuery UI Menu 1.11.2
+ * jQuery UI Menu 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -6366,7 +6361,7 @@ var accordion = $.widget( "ui.accordion", {
var menu = $.widget( "ui.menu", {
- version: "1.11.2",
+ version: "1.11.4",
defaultElement: "<ul>",
delay: 300,
options: {
@@ -6985,10 +6980,10 @@ var menu = $.widget( "ui.menu", {
/*!
- * jQuery UI Autocomplete 1.11.2
+ * jQuery UI Autocomplete 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -6997,7 +6992,7 @@ var menu = $.widget( "ui.menu", {
$.widget( "ui.autocomplete", {
- version: "1.11.2",
+ version: "1.11.4",
defaultElement: "<input>",
options: {
appendTo: null,
@@ -7597,10 +7592,10 @@ var autocomplete = $.ui.autocomplete;
/*!
- * jQuery UI Button 1.11.2
+ * jQuery UI Button 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -7636,7 +7631,7 @@ var lastActive,
};
$.widget( "ui.button", {
- version: "1.11.2",
+ version: "1.11.4",
defaultElement: "<button>",
options: {
disabled: null,
@@ -7932,7 +7927,7 @@ $.widget( "ui.button", {
});
$.widget( "ui.buttonset", {
- version: "1.11.2",
+ version: "1.11.4",
options: {
items: "button, input[type=button], input[type=submit],
input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
},
@@ -7994,10 +7989,10 @@ var button = $.ui.button;
/*!
- * jQuery UI Datepicker 1.11.2
+ * jQuery UI Datepicker 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -8005,7 +8000,7 @@ var button = $.ui.button;
*/
-$.extend($.ui, { datepicker: { version: "1.11.2" } });
+$.extend($.ui, { datepicker: { version: "1.11.4" } });
var datepicker_instActive;
@@ -8371,6 +8366,10 @@ $.extend(Datepicker.prototype, {
} else if (nodeName === "div" || nodeName === "span") {
$target.removeClass(this.markerClassName).empty();
}
+
+ if ( datepicker_instActive === inst ) {
+ datepicker_instActive = null;
+ }
},
/* Enable the date picker to a jQuery selection.
@@ -10055,16 +10054,16 @@ $.fn.datepicker = function(options){
$.datepicker = new Datepicker(); // singleton instance
$.datepicker.initialized = false;
$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.11.2";
+$.datepicker.version = "1.11.4";
var datepicker = $.datepicker;
/*!
- * jQuery UI Dialog 1.11.2
+ * jQuery UI Dialog 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -10073,7 +10072,7 @@ var datepicker = $.datepicker;
var dialog = $.widget( "ui.dialog", {
- version: "1.11.2",
+ version: "1.11.4",
options: {
appendTo: "body",
autoOpen: true,
@@ -10193,6 +10192,7 @@ var dialog = $.widget( "ui.dialog", {
var next,
originalPosition = this.originalPosition;
+ this._untrackInstance();
this._destroyOverlay();
this.element
@@ -10271,10 +10271,10 @@ var dialog = $.widget( "ui.dialog", {
_moveToTop: function( event, silent ) {
var moved = false,
- zIndicies = this.uiDialog.siblings( ".ui-front:visible"
).map(function() {
+ zIndices = this.uiDialog.siblings( ".ui-front:visible"
).map(function() {
return +$( this ).css( "z-index" );
}).get(),
- zIndexMax = Math.max.apply( null, zIndicies );
+ zIndexMax = Math.max.apply( null, zIndices );
if ( zIndexMax >= +this.uiDialog.css( "z-index" ) ) {
this.uiDialog.css( "z-index", zIndexMax + 1 );
@@ -10917,10 +10917,10 @@ var dialog = $.widget( "ui.dialog", {
/*!
- * jQuery UI Progressbar 1.11.2
+ * jQuery UI Progressbar 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -10929,7 +10929,7 @@ var dialog = $.widget( "ui.dialog", {
var progressbar = $.widget( "ui.progressbar", {
- version: "1.11.2",
+ version: "1.11.4",
options: {
max: 100,
value: 0,
@@ -11062,10 +11062,10 @@ var progressbar = $.widget( "ui.progressbar", {
/*!
- * jQuery UI Selectmenu 1.11.2
+ * jQuery UI Selectmenu 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -11074,7 +11074,7 @@ var progressbar = $.widget( "ui.progressbar", {
var selectmenu = $.widget( "ui.selectmenu", {
- version: "1.11.2",
+ version: "1.11.4",
defaultElement: "<select>",
options: {
appendTo: null,
@@ -11114,8 +11114,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
},
_drawButton: function() {
- var that = this,
- tabindex = this.element.attr( "tabindex" );
+ var that = this;
// Associate existing label with the new button
this.label = $( "label[for='" + this.ids.element + "']" ).attr(
"for", this.ids.button );
@@ -11132,7 +11131,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
// Create button
this.button = $( "<span>", {
"class": "ui-selectmenu-button ui-widget
ui-state-default ui-corner-all",
- tabindex: tabindex || this.options.disabled ? -1 : 0,
+ tabindex: this.options.disabled ? -1 : 0,
id: this.ids.button,
role: "combobox",
"aria-expanded": "false",
@@ -11642,7 +11641,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
data.push({
element: option,
index: index,
- value: option.attr( "value" ),
+ value: option.val(),
label: option.text(),
optgroup: optgroup.attr( "label" ) || "",
disabled: optgroup.prop( "disabled" ) ||
option.prop( "disabled" )
@@ -11662,10 +11661,10 @@ var selectmenu = $.widget( "ui.selectmenu", {
/*!
- * jQuery UI Slider 1.11.2
+ * jQuery UI Slider 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -11674,7 +11673,7 @@ var selectmenu = $.widget( "ui.selectmenu", {
var slider = $.widget( "ui.slider", $.ui.mouse, {
- version: "1.11.2",
+ version: "1.11.4",
widgetEventPrefix: "slide",
options: {
@@ -12195,8 +12194,26 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
},
_calculateNewMax: function() {
- var remainder = ( this.options.max - this._valueMin() ) %
this.options.step;
- this.max = this.options.max - remainder;
+ var max = this.options.max,
+ min = this._valueMin(),
+ step = this.options.step,
+ aboveMin = Math.floor( ( +( max - min ).toFixed(
this._precision() ) ) / step ) * step;
+ max = aboveMin + min;
+ this.max = parseFloat( max.toFixed( this._precision() ) );
+ },
+
+ _precision: function() {
+ var precision = this._precisionOf( this.options.step );
+ if ( this.options.min !== null ) {
+ precision = Math.max( precision, this._precisionOf(
this.options.min ) );
+ }
+ return precision;
+ },
+
+ _precisionOf: function( num ) {
+ var str = num.toString(),
+ decimal = str.indexOf( "." );
+ return decimal === -1 ? 0 : str.length - decimal - 1;
},
_valueMin: function() {
@@ -12346,10 +12363,10 @@ var slider = $.widget( "ui.slider", $.ui.mouse, {
/*!
- * jQuery UI Spinner 1.11.2
+ * jQuery UI Spinner 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -12369,7 +12386,7 @@ function spinner_modifier( fn ) {
}
var spinner = $.widget( "ui.spinner", {
- version: "1.11.2",
+ version: "1.11.4",
defaultElement: "<input>",
widgetEventPrefix: "spin",
options: {
@@ -12845,10 +12862,10 @@ var spinner = $.widget( "ui.spinner", {
/*!
- * jQuery UI Tabs 1.11.2
+ * jQuery UI Tabs 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -12857,7 +12874,7 @@ var spinner = $.widget( "ui.spinner", {
var tabs = $.widget( "ui.tabs", {
- version: "1.11.2",
+ version: "1.11.4",
delay: 300,
options: {
active: null,
@@ -13033,8 +13050,9 @@ var tabs = $.widget( "ui.tabs", {
clearTimeout( this.activating );
selectedIndex = this._focusNextTab( selectedIndex, goingForward
);
- // Navigating with control key will prevent automatic activation
- if ( !event.ctrlKey ) {
+ // Navigating with control/command key will prevent automatic
activation
+ if ( !event.ctrlKey && !event.metaKey ) {
+
// Update aria-selected immediately so that AT think
the tab is already selected.
// Otherwise AT may confuse the user by stating that
they need to activate the tab,
// but the tab will already be activated by the time
the announcement finishes.
@@ -13648,6 +13666,18 @@ var tabs = $.widget( "ui.tabs", {
eventData = {
tab: tab,
panel: panel
+ },
+ complete = function( jqXHR, status ) {
+ if ( status === "abort" ) {
+ that.panels.stop( false, true );
+ }
+
+ tab.removeClass( "ui-tabs-loading" );
+ panel.removeAttr( "aria-busy" );
+
+ if ( jqXHR === that.xhr ) {
+ delete that.xhr;
+ }
};
// not remote
@@ -13665,28 +13695,21 @@ var tabs = $.widget( "ui.tabs", {
panel.attr( "aria-busy", "true" );
this.xhr
- .success(function( response ) {
+ .done(function( response, status, jqXHR ) {
// support: jQuery <1.8
// http://bugs.jquery.com/ticket/11778
setTimeout(function() {
panel.html( response );
that._trigger( "load", event,
eventData );
+
+ complete( jqXHR, status );
}, 1 );
})
- .complete(function( jqXHR, status ) {
+ .fail(function( jqXHR, status ) {
// support: jQuery <1.8
// http://bugs.jquery.com/ticket/11778
setTimeout(function() {
- if ( status === "abort" ) {
- that.panels.stop(
false, true );
- }
-
- tab.removeClass(
"ui-tabs-loading" );
- panel.removeAttr( "aria-busy" );
-
- if ( jqXHR === that.xhr ) {
- delete that.xhr;
- }
+ complete( jqXHR, status );
}, 1 );
});
}
@@ -13711,10 +13734,10 @@ var tabs = $.widget( "ui.tabs", {
/*!
- * jQuery UI Tooltip 1.11.2
+ * jQuery UI Tooltip 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -13723,7 +13746,7 @@ var tabs = $.widget( "ui.tabs", {
var tooltip = $.widget( "ui.tooltip", {
- version: "1.11.2",
+ version: "1.11.4",
options: {
content: function() {
// support: IE<9, Opera in jQuery <1.7
@@ -13891,6 +13914,7 @@ var tooltip = $.widget( "ui.tooltip", {
});
}
+ this._registerCloseHandlers( event, target );
this._updateContent( target, event );
},
@@ -13905,13 +13929,16 @@ var tooltip = $.widget( "ui.tooltip", {
}
content = contentOption.call( target[0], function( response ) {
- // ignore async response if tooltip was closed already
- if ( !target.data( "ui-tooltip-open" ) ) {
- return;
- }
+
// IE may instantly serve a cached response for ajax
requests
// delay this call to _open so the other call to _open
runs first
that._delay(function() {
+
+ // Ignore async response if tooltip was closed
already
+ if ( !target.data( "ui-tooltip-open" ) ) {
+ return;
+ }
+
// jQuery creates a special event for focusin
when it doesn't
// exist natively. To improve performance, the
native event
// object is reused and the type is changed.
Therefore, we can't
@@ -13929,7 +13956,7 @@ var tooltip = $.widget( "ui.tooltip", {
},
_open: function( event, target, content ) {
- var tooltipData, tooltip, events, delayedShow, a11yContent,
+ var tooltipData, tooltip, delayedShow, a11yContent,
positionOption = $.extend( {}, this.options.position );
if ( !content ) {
@@ -14011,8 +14038,10 @@ var tooltip = $.widget( "ui.tooltip", {
}
this._trigger( "open", event, { tooltip: tooltip } );
+ },
- events = {
+ _registerCloseHandlers: function( event, target ) {
+ var events = {
keyup: function( event ) {
if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
var fakeEvent = $.Event(event);
@@ -14026,7 +14055,7 @@ var tooltip = $.widget( "ui.tooltip", {
// tooltips will handle this in destroy.
if ( target[ 0 ] !== this.element[ 0 ] ) {
events.remove = function() {
- this._removeTooltip( tooltip );
+ this._removeTooltip( this._find( target
).tooltip );
};
}
@@ -14047,6 +14076,12 @@ var tooltip = $.widget( "ui.tooltip", {
// The tooltip may already be closed
if ( !tooltipData ) {
+
+ // We set ui-tooltip-open immediately upon open (in
open()), but only set the
+ // additional data once there's actually content to
show (in _open()). So even if the
+ // tooltip doesn't have full data, we always remove
ui-tooltip-open in case we're in
+ // the period between open() and _open().
+ target.removeData( "ui-tooltip-open" );
return;
}
@@ -14157,10 +14192,10 @@ var tooltip = $.widget( "ui.tooltip", {
/*!
- * jQuery UI Effects 1.11.2
+ * jQuery UI Effects 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15052,7 +15087,7 @@ $.fn.extend({
(function() {
$.extend( $.effects, {
- version: "1.11.2",
+ version: "1.11.4",
// Saves a set of properties in a data storage
save: function( element, set ) {
@@ -15448,10 +15483,10 @@ var effect = $.effects;
/*!
- * jQuery UI Effects Blind 1.11.2
+ * jQuery UI Effects Blind 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15525,10 +15560,10 @@ var effectBlind = $.effects.effect.blind = function(
o, done ) {
/*!
- * jQuery UI Effects Bounce 1.11.2
+ * jQuery UI Effects Bounce 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15635,10 +15670,10 @@ var effectBounce = $.effects.effect.bounce =
function( o, done ) {
/*!
- * jQuery UI Effects Clip 1.11.2
+ * jQuery UI Effects Clip 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15699,10 +15734,10 @@ var effectClip = $.effects.effect.clip = function( o,
done ) {
/*!
- * jQuery UI Effects Drop 1.11.2
+ * jQuery UI Effects Drop 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15761,10 +15796,10 @@ var effectDrop = $.effects.effect.drop = function( o,
done ) {
/*!
- * jQuery UI Effects Explode 1.11.2
+ * jQuery UI Effects Explode 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15855,10 +15890,10 @@ var effectExplode = $.effects.effect.explode =
function( o, done ) {
/*!
- * jQuery UI Effects Fade 1.11.2
+ * jQuery UI Effects Fade 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15882,10 +15917,10 @@ var effectFade = $.effects.effect.fade = function( o,
done ) {
/*!
- * jQuery UI Effects Fold 1.11.2
+ * jQuery UI Effects Fold 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -15955,10 +15990,10 @@ var effectFold = $.effects.effect.fold = function( o,
done ) {
/*!
- * jQuery UI Effects Highlight 1.11.2
+ * jQuery UI Effects Highlight 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -16002,10 +16037,10 @@ var effectHighlight = $.effects.effect.highlight =
function( o, done ) {
/*!
- * jQuery UI Effects Size 1.11.2
+ * jQuery UI Effects Size 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -16222,10 +16257,10 @@ var effectSize = $.effects.effect.size = function( o,
done ) {
/*!
- * jQuery UI Effects Scale 1.11.2
+ * jQuery UI Effects Scale 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -16297,10 +16332,10 @@ var effectScale = $.effects.effect.scale = function(
o, done ) {
/*!
- * jQuery UI Effects Puff 1.11.2
+ * jQuery UI Effects Puff 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -16343,10 +16378,10 @@ var effectPuff = $.effects.effect.puff = function( o,
done ) {
/*!
- * jQuery UI Effects Pulsate 1.11.2
+ * jQuery UI Effects Pulsate 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -16403,10 +16438,10 @@ var effectPulsate = $.effects.effect.pulsate =
function( o, done ) {
/*!
- * jQuery UI Effects Shake 1.11.2
+ * jQuery UI Effects Shake 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -16474,10 +16509,10 @@ var effectShake = $.effects.effect.shake = function(
o, done ) {
/*!
- * jQuery UI Effects Slide 1.11.2
+ * jQuery UI Effects Slide 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -16535,10 +16570,10 @@ var effectSlide = $.effects.effect.slide = function(
o, done ) {
/*!
- * jQuery UI Effects Transfer 1.11.2
+ * jQuery UI Effects Transfer 1.11.4
* http://jqueryui.com
*
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 1720f4f..fb8b07c 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -449,7 +449,7 @@ function html_use_coolfieldset() {
function html_use_jqueryui() {
html_use_jquery();
- use_javascript('/scripts/jquery-ui/js/jquery-ui-1.11.2.js');
+ use_javascript('/scripts/jquery-ui/js/jquery-ui-1.11.4.js');
}
function html_use_jqueryjqplot() {
@@ -510,7 +510,7 @@ function html_use_jqueryteamworkgantt() {
function html_use_jquerysplitter() {
html_use_jquery();
- use_javascript('/scripts/jquery-splitter/js/jquery.splitter-0.8.0.js');
+ use_javascript('/scripts/jquery-splitter/js/jquery.splitter-0.20.0.js');
use_stylesheet('/scripts/jquery-splitter/css/jquery.splitter.css');
}
diff --git a/src/www/themes/css/fusionforge.css
b/src/www/themes/css/fusionforge.css
index 7a96d08..5b792f9 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -1010,3 +1010,8 @@ table.boxed th, table.bordered th {
font-weight: bold;
background-color: #d8d8d8;
}
+
+/* overwrite some css for splitter to avoid overlap with jquery modal panel */
+.vsplitter {
+ z-index: 100 !important;
+}
diff --git a/src/www/themes/funky-wOw/Theme.class.php
b/src/www/themes/funky-wOw/Theme.class.php
index 0b62734..14a1ff6 100644
--- a/src/www/themes/funky-wOw/Theme.class.php
+++ b/src/www/themes/funky-wOw/Theme.class.php
@@ -5,7 +5,7 @@
* Copyright 2010, Antoine Mercadal - Capgemini
* Copyright 2010, Marc-Etienne Vargenau, Alcatel-Lucent
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2015, Franck Villaume - TrivialDev
+ * Copyright 2011-2016, Franck Villaume - TrivialDev
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge. FusionForge is free software;
@@ -33,9 +33,9 @@ class Theme_Funky_Wow extends Theme_Funky {
$this->imgbaseurl = $this->themeurl . 'images/';
$this->imgroot = $this->imgbaseurl;
$this->addStylesheet('/themes/funky-wOw/css/theme.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui-1.11.2.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.structure-1.11.2.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.theme-1.11.2.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui-1.11.4.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.structure-1.11.4.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.theme-1.11.4.css');
}
}
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index 62a5160..3692f47 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -5,7 +5,7 @@
* Copyright 2010, Antoine Mercadal - Capgemini
* Copyright 2010, Marc-Etienne Vargenau, Alcatel-Lucent
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2015, Franck Villaume - TrivialDev
+ * Copyright 2011-2016, Franck Villaume - TrivialDev
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge. FusionForge is free software;
@@ -34,9 +34,9 @@ class Theme_Funky extends Layout {
$this->imgroot = $this->imgbaseurl;
$this->addStylesheet('/themes/funky/css/theme.css');
$this->addStylesheet('/themes/funky/css/theme-pages.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui-1.11.2.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui.structure-1.11.2.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui.theme-1.11.2.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui-1.11.4.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui.structure-1.11.4.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui.theme-1.11.4.css');
}
function bodyHeader($params) {
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 16 +-
src/vendor/jquery-splitter/css/jquery.splitter.css | 18 +-
...splitter-0.8.0.js => jquery.splitter-0.20.0.js} | 140 ++++--
.../overcast/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes
.../overcast/images/ui-bg_flat_0_eeeeee_40x100.png | Bin 220 -> 0 bytes
.../images/ui-bg_flat_55_c0402a_40x100.png | Bin 206 -> 0 bytes
.../images/ui-bg_flat_55_eeeeee_40x100.png | Bin 220 -> 0 bytes
.../images/ui-bg_glass_100_f8f8f8_1x400.png | Bin 262 -> 262 bytes
.../images/ui-bg_glass_35_dddddd_1x400.png | Bin 262 -> 262 bytes
.../images/ui-bg_glass_60_eeeeee_1x400.png | Bin 262 -> 262 bytes
.../images/ui-bg_inset-hard_75_999999_1x100.png | Bin 253 -> 253 bytes
.../images/ui-bg_inset-soft_50_c9c9c9_1x100.png | Bin 281 -> 281 bytes
.../overcast/images/ui-icons_3383bb_256x240.png | Bin 4549 -> 4549 bytes
.../overcast/images/ui-icons_454545_256x240.png | Bin 6992 -> 6992 bytes
.../overcast/images/ui-icons_70b2e1_256x240.png | Bin 4549 -> 4549 bytes
.../overcast/images/ui-icons_999999_256x240.png | Bin 6986 -> 6986 bytes
.../overcast/images/ui-icons_fbc856_256x240.png | Bin 4549 -> 4549 bytes
.../{jquery-ui-1.11.2.css => jquery-ui-1.11.4.css} | 12 +-
...e-1.11.2.css => jquery-ui.structure-1.11.4.css} | 4 +-
...theme-1.11.2.css => jquery-ui.theme-1.11.4.css} | 12 +-
.../ui-bg_diagonals-medium_20_d34d17_40x40.png | Bin 382 -> 382 bytes
.../sunny/images/ui-bg_flat_30_cccccc_40x100.png | Bin 220 -> 0 bytes
.../sunny/images/ui-bg_flat_50_5c5c5c_40x100.png | Bin 230 -> 0 bytes
.../images/ui-bg_gloss-wave_45_817865_500x100.png | Bin 5891 -> 5891 bytes
.../images/ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 5849 -> 5849 bytes
.../images/ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 5543 -> 5543 bytes
.../images/ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 5389 -> 5389 bytes
.../ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 343 -> 343 bytes
.../images/ui-bg_inset-soft_30_ffffff_1x100.png | Bin 203 -> 203 bytes
.../css/sunny/images/ui-icons_3d3d3d_256x240.png | Bin 6992 -> 6992 bytes
.../css/sunny/images/ui-icons_bd7b00_256x240.png | Bin 4549 -> 4549 bytes
.../css/sunny/images/ui-icons_d19405_256x240.png | Bin 4549 -> 4549 bytes
.../css/sunny/images/ui-icons_eb990f_256x240.png | Bin 4549 -> 4549 bytes
.../css/sunny/images/ui-icons_ed9f26_256x240.png | Bin 4549 -> 4549 bytes
.../css/sunny/images/ui-icons_fadc7a_256x240.png | Bin 4549 -> 4549 bytes
.../css/sunny/images/ui-icons_ffe180_256x240.png | Bin 4549 -> 4549 bytes
.../{jquery-ui-1.11.2.css => jquery-ui-1.11.4.css} | 8 +-
...e-1.11.2.css => jquery-ui.structure-1.11.4.css} | 4 +-
...theme-1.11.2.css => jquery-ui.theme-1.11.4.css} | 8 +-
.../{jquery-ui-1.11.2.js => jquery-ui-1.11.4.js} | 501 +++++++++++----------
src/www/include/html.php | 4 +-
src/www/themes/css/fusionforge.css | 5 +
src/www/themes/funky-wOw/Theme.class.php | 8 +-
src/www/themes/funky/Theme.class.php | 8 +-
44 files changed, 423 insertions(+), 325 deletions(-)
rename src/vendor/jquery-splitter/js/{jquery.splitter-0.8.0.js =>
jquery.splitter-0.20.0.js} (64%)
delete mode 100644
src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
delete mode 100644
src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
delete mode 100644
src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
delete mode 100644
src/vendor/jquery-ui/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
rename src/vendor/jquery-ui/css/overcast/{jquery-ui-1.11.2.css =>
jquery-ui-1.11.4.css} (98%)
rename src/vendor/jquery-ui/css/overcast/{jquery-ui.structure-1.11.2.css =>
jquery-ui.structure-1.11.4.css} (99%)
rename src/vendor/jquery-ui/css/overcast/{jquery-ui.theme-1.11.2.css =>
jquery-ui.theme-1.11.4.css} (97%)
delete mode 100644
src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_30_cccccc_40x100.png
delete mode 100644
src/vendor/jquery-ui/css/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png
rename src/vendor/jquery-ui/css/sunny/{jquery-ui-1.11.2.css =>
jquery-ui-1.11.4.css} (99%)
rename src/vendor/jquery-ui/css/sunny/{jquery-ui.structure-1.11.2.css =>
jquery-ui.structure-1.11.4.css} (99%)
rename src/vendor/jquery-ui/css/sunny/{jquery-ui.theme-1.11.2.css =>
jquery-ui.theme-1.11.4.css} (98%)
rename src/vendor/jquery-ui/js/{jquery-ui-1.11.2.js => jquery-ui-1.11.4.js}
(97%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
