From 7abf2e4c69b1fdaf962fa6f69682fdf530c7b7a3 Mon Sep 17 00:00:00 2001 From: Camzilla Date: Wed, 27 Aug 2014 10:45:39 +0200 Subject: [PATCH 1/5] Substracted padding variables to bottom and top container * Fixed issue with that adding padding makes pinned element overlap container --- jquery.pin.js | 4 ++-- jquery.pin.min.js | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/jquery.pin.js b/jquery.pin.js index 30aa09a..97d25c8 100644 --- a/jquery.pin.js +++ b/jquery.pin.js @@ -62,8 +62,8 @@ elmts.push($this); - var from = data.from, - to = data.to; + var from = data.from - data.pad.bottom, + to = data.to - data.pad.top; if (from + $this.outerHeight() > data.end) { $this.css('position', ''); diff --git a/jquery.pin.min.js b/jquery.pin.min.js index f22dcea..04cc68d 100644 --- a/jquery.pin.min.js +++ b/jquery.pin.min.js @@ -1,4 +1 @@ -(function(e){e.fn.pin=function(a){var g=0,h=[],n=!1,k=e(window),a=a||{},m=function(){for(var i=0,d=h.length;i"); -var g=e.extend({top:0,bottom:0},a.padding||{});b.data("pin",{pad:g,from:(a.containerSelector?j.top:f.top)-g.top,to:j.top+c.height()-b.outerHeight()-g.bottom,end:j.top+c.height(),parentTop:l.top});b.css({width:b.outerWidth()});b.parent().css("height",b.outerHeight())}}},o=function(){if(!n){g=k.scrollTop();for(var i=[],d=0,b=h.length;df.end?c.css("position",""):jg?("fixed"!=c.css("position")&&c.css({left:c.offset().left, -top:f.pad.top}).css("position","fixed"),a.activeClass&&c.addClass(a.activeClass)):g>=l?(c.css({left:"",top:l-f.parentTop+f.pad.top}).css("position","absolute"),a.activeClass&&c.addClass(a.activeClass)):(c.css({position:"",top:"",left:""}),a.activeClass&&c.removeClass(a.activeClass))}}h=i}},p=function(){m();o()};this.each(function(){var a=e(this),d=e(this).data("pin")||{};if(!d||!d.update)h.push(a),e("img",this).one("load",m),d.update=p,e(this).data("pin",d)});k.scroll(o);k.resize(function(){m()}); -m();k.load(p);return this}})(jQuery); +(function(e){"use strict";e.fn.pin=function(t){var n=0,r=[],i=false,s=e(window);t=t||{};var o=function(){for(var n=0,o=r.length;n")}var h=e.extend({top:0,bottom:0},t.padding||{});u.data("pin",{pad:h,from:(t.containerSelector?l.top:f.top)-h.top,to:l.top+a.height()-u.outerHeight()-h.bottom,end:l.top+a.height(),parentTop:c.top});u.css({width:u.outerWidth()});u.parent().css("height",u.outerHeight())}};var u=function(){if(i){return}n=s.scrollTop();var o=[];for(var u=0,a=r.length;ul.end){f.css("position","");continue}if(cn){!(f.css("position")=="fixed")&&f.css({left:f.offset().left,top:l.pad.top}).css("position","fixed");if(t.activeClass){f.addClass(t.activeClass)}}else if(n>=h){f.css({left:"",top:h-l.parentTop+l.pad.top}).css("position","absolute");if(t.activeClass){f.addClass(t.activeClass)}}else{f.css({position:"",top:"",left:""});if(t.activeClass){f.removeClass(t.activeClass)}}}r=o};var a=function(){o();u()};this.each(function(){var t=e(this),n=e(this).data("pin")||{};if(n&&n.update){return}r.push(t);e("img",this).one("load",o);n.update=a;e(this).data("pin",n)});s.scroll(u);s.resize(function(){o()});o();s.load(a);return this}})(jQuery) \ No newline at end of file From 33114e31fdc4fa71bdd385bbd8488027558ddc0f Mon Sep 17 00:00:00 2001 From: Aris FM Date: Tue, 6 Jan 2015 18:47:55 +0700 Subject: [PATCH 2/5] add bower.json --- bower.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..c879783 --- /dev/null +++ b/bower.json @@ -0,0 +1,28 @@ +{ + "name": "jquery.pin", + "main": "jquery.pin.js", + "version": "1.0.3", + "homepage": "https://github.com/webpop/jquery.pin", + "authors": [ + "Mathias Biilmann " + ], + "description": "jQuery.Pin is a plugin to pin any element within a container", + "keywords": [ + "pin", + "sticky", + "jquery", + "sticky", + "plugin", + "jquery", + "pin", + "plugin" + ], + "license": "The BSD 2-Clause License", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ] +} From 2274a00b665e21805057d045d9d95a44d739a0a5 Mon Sep 17 00:00:00 2001 From: Aris FM Date: Tue, 6 Jan 2015 19:02:23 +0700 Subject: [PATCH 3/5] Update bower.json --- bower.json | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bower.json b/bower.json index c879783..06b85cc 100644 --- a/bower.json +++ b/bower.json @@ -6,16 +6,13 @@ "authors": [ "Mathias Biilmann " ], + "dependencies": { + "jquery": ">=1.8.0" + }, "description": "jQuery.Pin is a plugin to pin any element within a container", "keywords": [ "pin", - "sticky", - "jquery", - "sticky", - "plugin", - "jquery", - "pin", - "plugin" + "sticky" ], "license": "The BSD 2-Clause License", "ignore": [ From dcf08bed871bf6acd23b54d30dfd6fe5a2a2ee52 Mon Sep 17 00:00:00 2001 From: Aris FM Date: Tue, 13 Jan 2015 14:38:34 +0700 Subject: [PATCH 4/5] Update bower.json Change homepage --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 06b85cc..ae6f3bd 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "jquery.pin", "main": "jquery.pin.js", "version": "1.0.3", - "homepage": "https://github.com/webpop/jquery.pin", + "homepage": "http://webpop.github.io/jquery.pin/", "authors": [ "Mathias Biilmann " ], From 7aae4cd7fa5b9467ea7efc75909aff8e60446bfc Mon Sep 17 00:00:00 2001 From: Mathias Biilmann Christensen Date: Thu, 22 Jan 2015 12:38:08 -0800 Subject: [PATCH 5/5] Update bower version --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index ae6f3bd..1d775ac 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "jquery.pin", "main": "jquery.pin.js", - "version": "1.0.3", + "version": "1.0.4", "homepage": "http://webpop.github.io/jquery.pin/", "authors": [ "Mathias Biilmann "