Skip to content

Commit

Permalink
Item13389: datepicker initializaiton problem; ...
Browse files Browse the repository at this point in the history 
- datepicker z-index problem
- pushy tooltips not hidden when typing into an input field
- error in jquery.foswiki api getPubUrlPath
  • Loading branch information
@MichaelDaum
MichaelDaum committed Apr 30, 2015
1 parent 9fde37a commit 6a40da6
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 78 deletions.
62 changes: 2 additions & 60 deletions JQueryPlugin/data/System/JQueryPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1427074085" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1430403240" format="1.1" version="1"}%
---+!! %TOPIC%
<!--
* Set SHORTDESCRIPTION = jQuery <nop>JavaScript library for Foswiki
Expand Down Expand Up @@ -122,6 +122,7 @@ reduce bandwidth and speed up interactive performance.
---++ Plugin Info
| Maintainer(s): | Michael Daum |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 30 Apr 2015: | (6.11) - Item13389: datepicker initializaiton problem; datepicker z-index problem; pushy tooltips not hidden when typing into an input field; error in jquery.foswiki api getPubUrlPath |
| 23 Feb 2015: | (6.10) - Item13272: upgraded superfish and hoverintent, deprecated subpersubs |
| 12 Jan 2015: | (6.01) - Item13205: added jquery-1.11.2 and jquery-2.1.3 |
| 29 Nov 2014: | (6.01) - Item13123: Add PLACEHOLDER parameter to JQueryAjaxHelper topic selector. |
Expand Down Expand Up @@ -342,62 +343,3 @@ reduce bandwidth and speed up interactive performance.
%META:FIELD{name="License" title="License" value="GPL"}%
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="Foswiki:Support/%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="jquery-1.10.1.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="274080" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.0.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="129635" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.2.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="40637" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.2.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="36903" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.0.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="259837" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" user="ProjectContributor" date="1427074085" size="445" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.1.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="139912" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.3.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="267739" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.3.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="40784" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.1.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="128982" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.3.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="130721" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.10.0.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="273810" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.2.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="147366" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.2.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="41506" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.7.1.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="248235" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.10.0.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="143565" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.0.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="36867" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.7.2.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="39849" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.7.2.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="139304" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.0.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="147756" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.2.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="142017" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.1.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="261525" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.1.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="37077" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.3.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="142303" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.0.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="240196" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.0.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="244963" version="1"}%
%META:FILEATTACHMENT{name="noconflict.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="30" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.0.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="139404" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.0.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="41488" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.9.1.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="268381" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.10.1.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="40854" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.2.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="284184" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.0.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="282944" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.1.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="40172" version="1"}%
%META:FILEATTACHMENT{name="noconflict.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="27" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.10.1.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="143620" version="1"}%
%META:FILEATTACHMENT{name="Makefile.include" attr="h" comment="" user="ProjectContributor" date="1427074085" size="2188" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.0.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="36553" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.2.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="266882" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.1.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="130555" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.9.1.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="40640" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.2.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="128970" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.1.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="41416" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.1.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="282766" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.3.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="37126" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.1.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="247351" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.1.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="242727" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.7.1.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="39200" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.1.3.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="247387" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.2.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="242915" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.11.1.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="147073" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.7.2.uncompressed.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="252881" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.10.0.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="40831" version="1"}%
%META:FILEATTACHMENT{name="noconflict.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="47" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.7.1.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="137090" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.1.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="36875" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.9.1.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="142561" version="1"}%
%META:FILEATTACHMENT{name="jquery-2.0.0.js" attr="h" comment="" user="ProjectContributor" date="1427074085" size="128365" version="1"}%
%META:FILEATTACHMENT{name="jquery-1.8.0.js.gz" attr="h" comment="" user="ProjectContributor" date="1427074085" size="40051" version="1"}%
6 changes: 3 additions & 3 deletions JQueryPlugin/data/System/JQueryValidate.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1315838249" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1430403240" format="1.1" version="1"}%
%META:TOPICPARENT{name="JQueryPlugin"}%
---+ %TOPIC%
%JQPLUGINS{"validate"
Expand All @@ -22,10 +22,10 @@ Very powerful client-side form validation framework
<div class="foswikiFormSteps">
<div class="foswikiFormStep">
<h3>First name:</h3>
<input type="text" size="30" class="foswikiInputField {required:true}" name="firstname" value="%URLPARAM{"firstname"}%" />
<input type="text" size="30" class="foswikiInputField required" name="firstname" value="%URLPARAM{"firstname"}%" />

<h3>Last name:</h3>
<input type="text" size="30" class="foswikiInputField {required:true}" name="lastname" value="%URLPARAM{"lastname"}%" />
<input type="text" size="30" class="foswikiInputField required" name="lastname" value="%URLPARAM{"lastname"}%" />

<h3>Date of birth:</h3>
<input type="text" size="10" class="required date foswikiInputField" mask="99/99/9999" name="dateofbirth" value="%URLPARAM{"dateofbirth"}%" />
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
View file
Expand Up @@ -24,8 +24,8 @@ BEGIN {
}
}

our $VERSION = '6.11';
our $RELEASE = '02 Mar 2015';
our $VERSION = '6.12';
our $RELEASE = '30 Apr 2015';
our $SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/UI/DATEPICKER.pm
View file
Expand Up @@ -33,7 +33,7 @@ sub new {
author => 'see http://jqueryui.com/about',
homepage => 'http://api.jqueryui.com/datepicker/',
javascript => ['jquery.ui.datepicker.init.js'],
dependencies => [ 'ui', ],
dependencies => [ 'ui', 'livequery' ],
),
$class
);
Expand Down
3 changes: 2 additions & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/plugins/blockui/jquery.blockUI.uncompressed.js
View file
Expand Up @@ -409,8 +409,9 @@
if (opts.focusInput)
setTimeout(focus, 20);
}
else
else {
center(lyr3[0], opts.centerX, opts.centerY);
}

if (opts.timeout) {
// auto-unblock
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.uncompressed.js
View file
Expand Up @@ -124,7 +124,7 @@ var foswiki = foswiki || {
return _getPubUrl(1, web, topic, file, params);
};
foswiki.getPubUrlPath = function(web, topic, params) {
return _getScriptUrl(0, script, web, topic, params);
return _getPubUrl(0, web, topic, params);
};

/**
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/plugins/tabpane/jquery.tabpane.uncompressed.js
View file
Expand Up @@ -164,7 +164,6 @@ $.tabpane = {
opacity: 1.0
}, 300);
}
$(window).trigger("resize");
} else {
// animate height
if (thisOpts.animate) {
Expand All @@ -191,6 +190,7 @@ $.tabpane = {
}
}
}
$(window).trigger("resize");

// after click handler
if (typeof(data.afterHandler) == "function") {
Expand Down
14 changes: 13 additions & 1 deletion JQueryPlugin/pub/System/JQueryPlugin/themes/foswiki/jquery-ui.uncompressed.css
View file
Expand Up @@ -1426,11 +1426,15 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad

/* Datepicker
----------------------------------*/
input.jqUIDatepicker {
position:relative;
z-index: 3;
}
.ui-datepicker {
width: 17em;
padding:0px;
display:none;
z-index:3 !important; /* > than anything ui-slider, < than ui-dialog */
z-index: 4;
}
.ui-datepicker-inline {
display:block;
Expand Down Expand Up @@ -1499,7 +1503,15 @@ table.ui-datepicker-inline {
color:#999;
}

.ui-datepicker .ui-datepicker-today {
background: #efffd8;
color:#599E00;
}
.ui-datepicker .ui-datepicker-today a {
border-color:transparent;
}
.ui-datepicker td a:active,
.ui-datepicker td a:hover,
.ui-datepicker .ui-datepicker-week-day .ui-state-active,
.ui-datepicker .ui-datepicker-week-end .ui-state-active,
.ui-datepicker td .ui-state-active {
Expand Down
4 changes: 2 additions & 2 deletions JQueryPlugin/pub/System/JQueryPlugin/ui/jquery-ui.uncompressed.js
View file
Expand Up @@ -14201,11 +14201,11 @@ $.widget( "ui.tooltip", {

events = {
keyup: function( event ) {
if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
//if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
var fakeEvent = $.Event(event);
fakeEvent.currentTarget = target[0];
this.close( fakeEvent, true );
}
//}
},
remove: function() {
this._removeTooltip( tooltip );
Expand Down
23 changes: 19 additions & 4 deletions JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.datepicker.init.uncompressed.js
View file
Expand Up @@ -2,12 +2,27 @@
jQuery(function($) {

var datepickerDefaults = {
dateFormat:'yy-mm-dd',
dateFormat:'d M yy',
firstDay: 1
};

$(".jqUIDatepicker").each(function() {
var $this = $(this), opts = $.extend({}, datepickerDefaults, $this.metadata());
$this.removeClass("jqUIDatepicker").datepicker(opts);
$(".jqUIDatepicker").livequery(function() {
var $this = $(this),
opts = $.extend({}, datepickerDefaults, $this.data(), $this.metadata()),
maxZIndex = 1;

$this.parents().each(function() {
var zIndex = parseInt($(this).css("z-index"), 10);
if (zIndex > maxZIndex) {
maxZIndex = zIndex;
}
});

$this.css({
"position": "relative",
"z-index": maxZIndex + 1
});

$this.datepicker(opts);
});
});
4 changes: 2 additions & 2 deletions JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.tooltip.js
View file
Expand Up @@ -284,11 +284,11 @@ $.widget( "ui.tooltip", {

events = {
keyup: function( event ) {
if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
//if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
var fakeEvent = $.Event(event);
fakeEvent.currentTarget = target[0];
this.close( fakeEvent, true );
}
//}
},
remove: function() {
this._removeTooltip( tooltip );
Expand Down

0 comments on commit 6a40da6

Please sign in to comment.