Skip to content

Commit

Permalink
Item12519: upgraded superfish, supersubs and hoverIntent to latest ve…
Browse files Browse the repository at this point in the history
…rsions

git-svn-id: http://svn.foswiki.org/branches/Release01x01@16771 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed May 30, 2013
1 parent 77e6d63 commit ec93f52
Show file tree
Hide file tree
Showing 18 changed files with 926 additions and 835 deletions.
3 changes: 2 additions & 1 deletion JQueryPlugin/data/System/JQueryPlugin.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1360672210" format="1.1" version="15"}%
%META:TOPICINFO{author="ProjectContributor" date="1360672210" format="1.1" version="1"}%
---+!! %TOPIC%
<!--
* Set SHORTDESCRIPTION = jQuery <nop>JavaScript library for Foswiki
Expand Down Expand Up @@ -127,6 +127,7 @@ reduce bandwidth and speed up interactive performance.
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 30 May 2013: | (4.80) - Item12519: upgraded superfish, supersubs and hoverintent |
| 29 May 2013: | (4.70) - Item12345: added jquery-1.9.1, jquery-1.10.0, jquery-2.0.0, jquery-2.0.1; \
removed themeswitcher as it isn't supported and non-functional anymore; \
upgraded to jquery-ui-1.10.3; \
Expand Down
746 changes: 372 additions & 374 deletions JQueryPlugin/data/System/JQuerySuperfish.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'hoverIntent',
version => 'r6',
version => 'r7',
author => 'Brian Cherne',
homepage =>
'http://cherne.net/brian/resources/jquery.hoverIntent.htm',
Expand Down
4 changes: 0 additions & 4 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -560,12 +560,8 @@ pub/System/JQueryPlugin/plugins/superfish/jquery.superfish.css.gz 0644
pub/System/JQueryPlugin/plugins/superfish/jquery.superfish.js 0644
pub/System/JQueryPlugin/plugins/superfish/jquery.superfish.js.gz 0644
pub/System/JQueryPlugin/plugins/superfish/jquery.superfish.uncompressed.css 0644
pub/System/JQueryPlugin/plugins/superfish/jquery.superfish.uncompressed.css.diff 0644
pub/System/JQueryPlugin/plugins/superfish/jquery.superfish.uncompressed.js 0644
pub/System/JQueryPlugin/plugins/superfish/Makefile 0644
pub/System/JQueryPlugin/plugins/superfish/MenuArrow.gif 0644
pub/System/JQueryPlugin/plugins/superfish/MenuArrow.png 0644
pub/System/JQueryPlugin/plugins/superfish/MenuShadow.png 0644
pub/System/JQueryPlugin/plugins/supersubs/jquery.supersubs.js 0644
pub/System/JQueryPlugin/plugins/supersubs/jquery.supersubs.js.gz 0644
pub/System/JQueryPlugin/plugins/supersubs/jquery.supersubs.uncompressed.js 0644
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SUPERFISH.pm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'Superfish',
version => '1.4.8',
version => '1.7.2',
author => 'Joel Birch',
homepage => 'http://users.tpg.com.au/j_birch/plugins/superfish/',
javascript => ['jquery.superfish.js'],
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/SUPERSUBS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'Supersubs',
version => '0.2b',
version => '0.3b',
author => 'Joel Birch',
homepage =>
'http://users.tpg.com.au/j_birch/plugins/superfish/#sample5',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,106 +1,114 @@
/**
* hoverIntent is similar to jQuery's built-in "hover" function except that
* instead of firing the onMouseOver event immediately, hoverIntent checks
* to see if the user's mouse has slowed down (beneath the sensitivity
* threshold) before firing the onMouseOver event.
*
* hoverIntent r6 // 2011.02.26 // jQuery 1.5.1+
* <http://cherne.net/brian/resources/jquery.hoverIntent.html>
*
* hoverIntent is currently available for use in all personal or commercial
* projects under both MIT and GPL licenses. This means that you can choose
* the license that best suits your project, and use it accordingly.
*
* // basic usage (just like .hover) receives onMouseOver and onMouseOut functions
* $("ul li").hoverIntent( showNav , hideNav );
*
* // advanced usage receives configuration object only
* $("ul li").hoverIntent({
* sensitivity: 7, // number = sensitivity threshold (must be 1 or higher)
* interval: 100, // number = milliseconds of polling interval
* over: showNav, // function = onMouseOver callback (required)
* timeout: 0, // number = milliseconds delay before onMouseOut function call
* out: hideNav // function = onMouseOut callback (required)
* });
*
* @param f onMouseOver function || An object with configuration options
* @param g onMouseOut function || Nothing (use configuration options object)
* @author Brian Cherne brian(at)cherne(dot)net
*/
* hoverIntent is similar to jQuery's built-in "hover" method except that
* instead of firing the handlerIn function immediately, hoverIntent checks
* to see if the user's mouse has slowed down (beneath the sensitivity
* threshold) before firing the event. The handlerOut function is only
* called after a matching handlerIn.
*
* hoverIntent r7 // 2013.03.11 // jQuery 1.9.1+
* http://cherne.net/brian/resources/jquery.hoverIntent.html
*
* You may use hoverIntent under the terms of the MIT license. Basically that
* means you are free to use hoverIntent as long as this header is left intact.
* Copyright 2007, 2013 Brian Cherne
*
* // basic usage ... just like .hover()
* .hoverIntent( handlerIn, handlerOut )
* .hoverIntent( handlerInOut )
*
* // basic usage ... with event delegation!
* .hoverIntent( handlerIn, handlerOut, selector )
* .hoverIntent( handlerInOut, selector )
*
* // using a basic configuration object
* .hoverIntent( config )
*
* @param handlerIn function OR configuration object
* @param handlerOut function OR selector for delegation OR undefined
* @param selector selector OR undefined
* @author Brian Cherne <brian(at)cherne(dot)net>
**/
(function($) {
$.fn.hoverIntent = function(f,g) {
// default configuration options
var cfg = {
sensitivity: 7,
interval: 100,
timeout: 0
};
// override configuration options with user supplied object
cfg = $.extend(cfg, g ? { over: f, out: g } : f );
$.fn.hoverIntent = function(handlerIn,handlerOut,selector) {

// instantiate variables
// cX, cY = current X and Y position of mouse, updated by mousemove event
// pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
var cX, cY, pX, pY;
// default configuration values
var cfg = {
interval: 100,
sensitivity: 7,
timeout: 0
};

// A private function for getting mouse position
var track = function(ev) {
cX = ev.pageX;
cY = ev.pageY;
};
if ( typeof handlerIn === "object" ) {
cfg = $.extend(cfg, handlerIn );
} else if ($.isFunction(handlerOut)) {
cfg = $.extend(cfg, { over: handlerIn, out: handlerOut, selector: selector } );
} else {
cfg = $.extend(cfg, { over: handlerIn, out: handlerIn, selector: handlerOut } );
}

// A private function for comparing current and previous mouse position
var compare = function(ev,ob) {
ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
// compare mouse positions to see if they've crossed the threshold
if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
$(ob).unbind("mousemove",track);
// set hoverIntent state to true (so mouseOut can be called)
ob.hoverIntent_s = 1;
return cfg.over.apply(ob,[ev]);
} else {
// set previous coordinates for next time
pX = cX; pY = cY;
// use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
}
};
// instantiate variables
// cX, cY = current X and Y position of mouse, updated by mousemove event
// pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
var cX, cY, pX, pY;

// A private function for delaying the mouseOut function
var delay = function(ev,ob) {
ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
ob.hoverIntent_s = 0;
return cfg.out.apply(ob,[ev]);
};
// A private function for getting mouse position
var track = function(ev) {
cX = ev.pageX;
cY = ev.pageY;
};

// A private function for handling mouse 'hovering'
var handleHover = function(e) {
// copy objects to be passed into t (required for event object to be passed in IE)
var ev = jQuery.extend({},e);
var ob = this;
// A private function for comparing current and previous mouse position
var compare = function(ev,ob) {
ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
// compare mouse positions to see if they've crossed the threshold
if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
$(ob).off("mousemove.hoverIntent",track);
// set hoverIntent state to true (so mouseOut can be called)
ob.hoverIntent_s = 1;
return cfg.over.apply(ob,[ev]);
} else {
// set previous coordinates for next time
pX = cX; pY = cY;
// use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
}
};

// cancel hoverIntent timer if it exists
if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
// A private function for delaying the mouseOut function
var delay = function(ev,ob) {
ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
ob.hoverIntent_s = 0;
return cfg.out.apply(ob,[ev]);
};

// if e.type == "mouseenter"
if (e.type == "mouseenter") {
// set "previous" X and Y position based on initial entry point
pX = ev.pageX; pY = ev.pageY;
// update "current" X and Y position based on mousemove
$(ob).bind("mousemove",track);
// start polling interval (self-calling timeout) to compare mouse coordinates over time
if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
// A private function for handling mouse 'hovering'
var handleHover = function(e) {
// copy objects to be passed into t (required for event object to be passed in IE)
var ev = jQuery.extend({},e);
var ob = this;

// else e.type == "mouseleave"
} else {
// unbind expensive mousemove event
$(ob).unbind("mousemove",track);
// if hoverIntent state is true, then call the mouseOut function after the specified delay
if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
}
};
// cancel hoverIntent timer if it exists
if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }

// bind the function to the two event listeners
return this.bind('mouseenter',handleHover).bind('mouseleave',handleHover);
};
// if e.type == "mouseenter"
if (e.type == "mouseenter") {
// set "previous" X and Y position based on initial entry point
pX = ev.pageX; pY = ev.pageY;
// update "current" X and Y position based on mousemove
$(ob).on("mousemove.hoverIntent",track);
// start polling interval (self-calling timeout) to compare mouse coordinates over time
if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}

// else e.type == "mouseleave"
} else {
// unbind expensive mousemove event
$(ob).off("mousemove.hoverIntent",track);
// if hoverIntent state is true, then call the mouseOut function after the specified delay
if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
}
};

// listen for mouseenter and mouseleave
return this.on({'mouseenter.hoverIntent':handleHover,'mouseleave.hoverIntent':handleHover}, cfg.selector);
};
})(jQuery);
15 changes: 0 additions & 15 deletions JQueryPlugin/pub/System/JQueryPlugin/plugins/superfish/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,3 @@ TARGET= \
$(JQUERYPLUGIN_LIB)/SUPERFISH.pm

-include ../../Makefile.include

### SMELL: what's that
#upstream: copyupstream patch all
#
#copyupstream:
# cp superfish-1.4.8/css/superfish.css jquery.superfish.uncompressed.css
# cp superfish-1.4.8/css/superfish-navbar.css jquery.superfish-navbar.uncompressed.css
# cp superfish-1.4.8/css/superfish-vertical.css jquery.superfish-vertical.uncompressed.css
# cp superfish-1.4.8/js/superfish.js jquery.superfish.uncompressed.js
# cp superfish-1.4.8/js/supersubs.js ../supersubs/jquery.supersubs.uncompressed.js
# cp superfish-1.4.8/images/arrows-ffffff.png MenuArrow.png
# cp superfish-1.4.8/images/shadow.png MenuShadow.png
#
#patch:
# patch -p0 < jquery.superfish.uncompressed.css.diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit ec93f52

Please sign in to comment.