Skip to content

Commit

Permalink
Solved scroll bug -> xbsoftware#73 and xbsoftware#82.
Browse files Browse the repository at this point in the history
  • Loading branch information
@m0rb1u5
m0rb1u5 committed May 14, 2018
1 parent c9ddc7e commit a61d1c0
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 23 deletions.
21 changes: 12 additions & 9 deletions enjoyhint.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ var EnjoyHint = function (_options) {
that.clear();
}, 250);

$(document.body).scrollTop(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -100});
$(document.body).scrollTo(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -100});

setTimeout(function () {

Expand Down Expand Up @@ -675,13 +675,16 @@ var EnjoyHint = function (_options) {

originalArrowLeft = [];
var attr = $('#enjoyhint_arrpw_line').attr('d');
originalArrowLeft.push(attr.substr(1).split(',')[0]);
originalArrowLeft.push(attr.substr(attr.indexOf('Q') + 1).split(',')[0]);
originalArrowLeft.push(attr.split(' ')[2].split(',')[0]);
originalArrowTop = [];
originalArrowTop.push(attr.split(',')[1].split(' ')[0]);
originalArrowTop.push(attr.split(',')[2].split(' ')[0]);
originalArrowTop.push(attr.split(',')[3]);

if (attr) {
originalArrowLeft.push(attr.substr(1).split(',')[0]);
originalArrowLeft.push(attr.substr(attr.indexOf('Q') + 1).split(',')[0]);
originalArrowLeft.push(attr.split(' ')[2].split(',')[0]);
originalArrowTop = [];
originalArrowTop.push(attr.split(',')[1].split(' ')[0]);
originalArrowTop.push(attr.split(',')[2].split(' ')[0]);
originalArrowTop.push(attr.split(',')[3]);
}
}

var labelElement = $('.enjoy_hint_label');
Expand Down Expand Up @@ -1573,4 +1576,4 @@ a.children=[];for(var b=this.getChildren(),c=b.length,d=0;c>d;d++){var e=b[d];a.
* @author Ariel Flesler
* @version 2.1.2
*/
;(function(f){"use strict";"function"===typeof define&&define.amd?define(["jquery"],f):"undefined"!==typeof module&&module.exports?module.exports=f(require("jquery")):f(jQuery)})(function($){"use strict";function n(a){return!a.nodeName||-1!==$.inArray(a.nodeName.toLowerCase(),["iframe","#document","html","body"])}function h(a){return $.isFunction(a)||$.isPlainObject(a)?a:{top:a,left:a}}var p=$.scrollTo=function(a,d,b){return $(window).scrollTo(a,d,b)};p.defaults={axis:"xy",duration:0,limit:!0};$.fn.scrollTo=function(a,d,b){"object"=== typeof d&&(b=d,d=0);"function"===typeof b&&(b={onAfter:b});"max"===a&&(a=9E9);b=$.extend({},p.defaults,b);d=d||b.duration;var u=b.queue&&1<b.axis.length;u&&(d/=2);b.offset=h(b.offset);b.over=h(b.over);return this.each(function(){function k(a){var k=$.extend({},b,{queue:!0,duration:d,complete:a&&function(){a.call(q,e,b)}});r.animate(f,k)}if(null!==a){var l=n(this),q=l?this.contentWindow||window:this,r=$(q),e=a,f={},t;switch(typeof e){case "number":case "string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(e)){e= h(e);break}e=l?$(e):$(e,q);case "object":if(e.length===0)return;if(e.is||e.style)t=(e=$(e)).offset()}var v=$.isFunction(b.offset)&&b.offset(q,e)||b.offset;$.each(b.axis.split(""),function(a,c){var d="x"===c?"Left":"Top",m=d.toLowerCase(),g="scroll"+d,h=r[g](),n=p.max(q,c);t?(f[g]=t[m]+(l?0:h-r.offset()[m]),b.margin&&(f[g]-=parseInt(e.css("margin"+d),10)||0,f[g]-=parseInt(e.css("border"+d+"Width"),10)||0),f[g]+=v[m]||0,b.over[m]&&(f[g]+=e["x"===c?"width":"height"]()*b.over[m])):(d=e[m],f[g]=d.slice&& "%"===d.slice(-1)?parseFloat(d)/100*n:d);b.limit&&/^\d+$/.test(f[g])&&(f[g]=0>=f[g]?0:Math.min(f[g],n));!a&&1<b.axis.length&&(h===f[g]?f={}:u&&(k(b.onAfterFirst),f={}))});k(b.onAfter)}})};p.max=function(a,d){var b="x"===d?"Width":"Height",h="scroll"+b;if(!n(a))return a[h]-$(a)[b.toLowerCase()]();var b="client"+b,k=a.ownerDocument||a.document,l=k.documentElement,k=k.body;return Math.max(l[h],k[h])-Math.min(l[b],k[b])};$.Tween.propHooks.scrollLeft=$.Tween.propHooks.scrollTop={get:function(a){return $(a.elem)[a.prop]()}, set:function(a){var d=this.get(a);if(a.options.interrupt&&a._last&&a._last!==d)return $(a.elem).stop();var b=Math.round(a.now);d!==b&&($(a.elem)[a.prop](b),a._last=this.get(a))}};return p});
;(function(f){"use strict";"function"===typeof define&&define.amd?define(["jquery"],f):"undefined"!==typeof module&&module.exports?module.exports=f(require("jquery")):f(jQuery)})(function($){"use strict";function n(a){return!a.nodeName||-1!==$.inArray(a.nodeName.toLowerCase(),["iframe","#document","html","body"])}function h(a){return $.isFunction(a)||$.isPlainObject(a)?a:{top:a,left:a}}var p=$.scrollTo=function(a,d,b){return $(window).scrollTo(a,d,b)};p.defaults={axis:"xy",duration:0,limit:!0};$.fn.scrollTo=function(a,d,b){"object"=== typeof d&&(b=d,d=0);"function"===typeof b&&(b={onAfter:b});"max"===a&&(a=9E9);b=$.extend({},p.defaults,b);d=d||b.duration;var u=b.queue&&1<b.axis.length;u&&(d/=2);b.offset=h(b.offset);b.over=h(b.over);return this.each(function(){function k(a){var k=$.extend({},b,{queue:!0,duration:d,complete:a&&function(){a.call(q,e,b)}});r.animate(f,k)}if(null!==a){var l=n(this),q=l?this.contentWindow||window:this,r=$(q),e=a,f={},t;switch(typeof e){case "number":case "string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(e)){e= h(e);break}e=l?$(e):$(e,q);case "object":if(e.length===0)return;if(e.is||e.style)t=(e=$(e)).offset()}var v=$.isFunction(b.offset)&&b.offset(q,e)||b.offset;$.each(b.axis.split(""),function(a,c){var d="x"===c?"Left":"Top",m=d.toLowerCase(),g="scroll"+d,h=r[g](),n=p.max(q,c);t?(f[g]=t[m]+(l?0:h-r.offset()[m]),b.margin&&(f[g]-=parseInt(e.css("margin"+d),10)||0,f[g]-=parseInt(e.css("border"+d+"Width"),10)||0),f[g]+=v[m]||0,b.over[m]&&(f[g]+=e["x"===c?"width":"height"]()*b.over[m])):(d=e[m],f[g]=d.slice&& "%"===d.slice(-1)?parseFloat(d)/100*n:d);b.limit&&/^\d+$/.test(f[g])&&(f[g]=0>=f[g]?0:Math.min(f[g],n));!a&&1<b.axis.length&&(h===f[g]?f={}:u&&(k(b.onAfterFirst),f={}))});k(b.onAfter)}})};p.max=function(a,d){var b="x"===d?"Width":"Height",h="scroll"+b;if(!n(a))return a[h]-$(a)[b.toLowerCase()]();var b="client"+b,k=a.ownerDocument||a.document,l=k.documentElement,k=k.body;return Math.max(l[h],k[h])-Math.min(l[b],k[b])};$.Tween.propHooks.scrollLeft=$.Tween.propHooks.scrollTop={get:function(a){return $(a.elem)[a.prop]()}, set:function(a){var d=this.get(a);if(a.options.interrupt&&a._last&&a._last!==d)return $(a.elem).stop();var b=Math.round(a.now);d!==b&&($(a.elem)[a.prop](b),a._last=this.get(a))}};return p});
8 changes: 3 additions & 5 deletions enjoyhint.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/enjoyhint.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ var EnjoyHint = function (_options) {
that.clear();
}, 250);

$(document.body).scrollTop(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -100});
$(document.body).scrollTo(step_data.selector, step_data.scrollAnimationSpeed || 250, {offset: -100});

setTimeout(function () {

Expand Down Expand Up @@ -412,4 +412,4 @@ var EnjoyHint = function (_options) {
};

init();
};
};
17 changes: 10 additions & 7 deletions src/jquery.enjoyhint.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,16 @@ CanvasRenderingContext2D.prototype.roundRect = function (x, y, w, h, r) {

originalArrowLeft = [];
var attr = $('#enjoyhint_arrpw_line').attr('d');
originalArrowLeft.push(attr.substr(1).split(',')[0]);
originalArrowLeft.push(attr.substr(attr.indexOf('Q') + 1).split(',')[0]);
originalArrowLeft.push(attr.split(' ')[2].split(',')[0]);
originalArrowTop = [];
originalArrowTop.push(attr.split(',')[1].split(' ')[0]);
originalArrowTop.push(attr.split(',')[2].split(' ')[0]);
originalArrowTop.push(attr.split(',')[3]);

if (attr) {
originalArrowLeft.push(attr.substr(1).split(',')[0]);
originalArrowLeft.push(attr.substr(attr.indexOf('Q') + 1).split(',')[0]);
originalArrowLeft.push(attr.split(' ')[2].split(',')[0]);
originalArrowTop = [];
originalArrowTop.push(attr.split(',')[1].split(' ')[0]);
originalArrowTop.push(attr.split(',')[2].split(' ')[0]);
originalArrowTop.push(attr.split(',')[3]);
}
}

var labelElement = $('.enjoy_hint_label');
Expand Down

0 comments on commit a61d1c0

Please sign in to comment.