From e084171e87f1a3839e565d03bcb3c05f4fcadcc8 Mon Sep 17 00:00:00 2001 From: hamityanik Date: Wed, 30 Dec 2015 12:28:04 +0200 Subject: [PATCH 1/2] easeIn and easeOut features added. --- base.html | 4 +++- js/mosaic.1.0.1.js | 6 ++++-- js/mosaic.1.0.1.min.js | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/base.html b/base.html index 83a3286..02928dd 100644 --- a/base.html +++ b/base.html @@ -26,7 +26,9 @@ jQuery(function($){ $('.bar').mosaic({ - animation : 'slide' + animation : 'slide', + easeIn : 'swing', + easeOut : 'linear' }); }); diff --git a/js/mosaic.1.0.1.js b/js/mosaic.1.0.1.js index a645aac..d340ce2 100644 --- a/js/mosaic.1.0.1.js +++ b/js/mosaic.1.0.1.js @@ -84,9 +84,9 @@ endState[base.options.anchor_y] = startY; $(base.el).hover(function () { - $(base.options.overlay, base.el).stop().animate(hoverState, base.options.speed); + $(base.options.overlay, base.el).stop().animate(hoverState, base.options.speed, base.options.easeIn); },function () { - $(base.options.overlay, base.el).stop().animate(endState, base.options.speed); + $(base.options.overlay, base.el).stop().animate(endState, base.options.speed, base.options.easeOut); }); break; @@ -101,6 +101,8 @@ animation : 'fade', speed : 150, opacity : 1, + easeIn : 'swing', + easeOut : 'swing', preload : 0, anchor_x : 'left', anchor_y : 'bottom', diff --git a/js/mosaic.1.0.1.min.js b/js/mosaic.1.0.1.min.js index d2d5de8..7f55ae2 100644 --- a/js/mosaic.1.0.1.min.js +++ b/js/mosaic.1.0.1.min.js @@ -7,4 +7,4 @@ Released under MIT License / GPL License */ -(function(a){if(!a.omr){a.omr=new Object()}a.omr.mosaic=function(c,b){var d=this;d.$el=a(c);d.el=c;d.$el.data("omr.mosaic",d);d.init=function(){d.options=a.extend({},a.omr.mosaic.defaultOptions,b);d.load_box()};d.load_box=function(){if(d.options.preload){a(d.options.backdrop,d.el).hide();a(d.options.overlay,d.el).hide();a(window).load(function(){if(d.options.options.animation=="fade"&&a(d.options.overlay,d.el).css("opacity")==0){a(d.options.overlay,d.el).css("filter","alpha(opacity=0)")}a(d.options.overlay,d.el).fadeIn(200,function(){a(d.options.backdrop,d.el).fadeIn(200)});d.allow_hover()})}else{a(d.options.backdrop,d.el).show();a(d.options.overlay,d.el).show();d.allow_hover()}};d.allow_hover=function(){switch(d.options.animation){case"fade":a(d.el).hover(function(){a(d.options.overlay,d.el).stop().fadeTo(d.options.speed,d.options.opacity)},function(){a(d.options.overlay,d.el).stop().fadeTo(d.options.speed,0)});break;case"slide":startX=a(d.options.overlay,d.el).css(d.options.anchor_x)!="auto"?a(d.options.overlay,d.el).css(d.options.anchor_x):"0px";startY=a(d.options.overlay,d.el).css(d.options.anchor_y)!="auto"?a(d.options.overlay,d.el).css(d.options.anchor_y):"0px";var f={};f[d.options.anchor_x]=d.options.hover_x;f[d.options.anchor_y]=d.options.hover_y;var e={};e[d.options.anchor_x]=startX;e[d.options.anchor_y]=startY;a(d.el).hover(function(){a(d.options.overlay,d.el).stop().animate(f,d.options.speed)},function(){a(d.options.overlay,d.el).stop().animate(e,d.options.speed)});break}};d.init()};a.omr.mosaic.defaultOptions={animation:"fade",speed:150,opacity:1,preload:0,anchor_x:"left",anchor_y:"bottom",hover_x:"0px",hover_y:"0px",overlay:".mosaic-overlay",backdrop:".mosaic-backdrop"};a.fn.mosaic=function(b){return this.each(function(){(new a.omr.mosaic(this,b))})}})(jQuery); \ No newline at end of file +(function(a){if(!a.omr){a.omr=new Object()}a.omr.mosaic=function(c,b){var d=this;d.$el=a(c);d.el=c;d.$el.data("omr.mosaic",d);d.init=function(){d.options=a.extend({},a.omr.mosaic.defaultOptions,b);d.load_box()};d.load_box=function(){if(d.options.preload){a(d.options.backdrop,d.el).hide();a(d.options.overlay,d.el).hide();a(window).load(function(){if(d.options.options.animation=="fade"&&a(d.options.overlay,d.el).css("opacity")==0){a(d.options.overlay,d.el).css("filter","alpha(opacity=0)")}a(d.options.overlay,d.el).fadeIn(200,function(){a(d.options.backdrop,d.el).fadeIn(200)});d.allow_hover()})}else{a(d.options.backdrop,d.el).show();a(d.options.overlay,d.el).show();d.allow_hover()}};d.allow_hover=function(){switch(d.options.animation){case"fade":a(d.el).hover(function(){a(d.options.overlay,d.el).stop().fadeTo(d.options.speed,d.options.opacity)},function(){a(d.options.overlay,d.el).stop().fadeTo(d.options.speed,0)});break;case"slide":startX=a(d.options.overlay,d.el).css(d.options.anchor_x)!="auto"?a(d.options.overlay,d.el).css(d.options.anchor_x):"0px";startY=a(d.options.overlay,d.el).css(d.options.anchor_y)!="auto"?a(d.options.overlay,d.el).css(d.options.anchor_y):"0px";var f={};f[d.options.anchor_x]=d.options.hover_x;f[d.options.anchor_y]=d.options.hover_y;var e={};e[d.options.anchor_x]=startX;e[d.options.anchor_y]=startY;a(d.el).hover(function(){a(d.options.overlay,d.el).stop().animate(f,d.options.speed,d.options.easeIn)},function(){a(d.options.overlay,d.el).stop().animate(e,d.options.speed,d.options.easeOut)});break}};d.init()};a.omr.mosaic.defaultOptions={animation:"fade",speed:150,opacity:1,easeIn:"swing",easeOut:"swing",preload:0,anchor_x:"left",anchor_y:"bottom",hover_x:"0px",hover_y:"0px",overlay:".mosaic-overlay",backdrop:".mosaic-backdrop"};a.fn.mosaic=function(b){return this.each(function(){(new a.omr.mosaic(this,b))})}})(jQuery); \ No newline at end of file From 8eb2cbfeb45f1999e6e96e0c48e2a3fae9f2d7ac Mon Sep 17 00:00:00 2001 From: "M. Hamit YANIK" Date: Sat, 23 Feb 2019 17:36:29 +0300 Subject: [PATCH 2/2] A few improvements --- js/mosaic.1.0.1.js | 14 +++++++------- js/mosaic.1.0.1.min.js | 11 +---------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/js/mosaic.1.0.1.js b/js/mosaic.1.0.1.js index d340ce2..197fe70 100644 --- a/js/mosaic.1.0.1.js +++ b/js/mosaic.1.0.1.js @@ -10,8 +10,8 @@ (function($){ if(!$.omr){ - $.omr = new Object(); - }; + $.omr = {}; + } $.omr.mosaic = function(el, options){ @@ -39,8 +39,8 @@ $(window).load(function(){ // IE transparency fade fix - if(base.options.options.animation == 'fade' && $(base.options.overlay, base.el).css('opacity') == 0 ) $(base.options.overlay, base.el).css('filter', 'alpha(opacity=0)'); - + if(base.options.options.animation === 'fade' && $(base.options.overlay, base.el).css('opacity') === 0 ) $(base.options.overlay, base.el).css('filter', 'alpha(opacity=0)'); + $(base.options.overlay, base.el).fadeIn(200, function(){ $(base.options.backdrop, base.el).fadeIn(200); }); @@ -72,8 +72,8 @@ // Handle slide animations case 'slide': // Grab default overlay x,y position - startX = $(base.options.overlay, base.el).css(base.options.anchor_x) != 'auto' ? $(base.options.overlay, base.el).css(base.options.anchor_x) : '0px'; - startY = $(base.options.overlay, base.el).css(base.options.anchor_y) != 'auto' ? $(base.options.overlay, base.el).css(base.options.anchor_y) : '0px';; + var startX = $(base.options.overlay, base.el).css(base.options.anchor_x) !== 'auto' ? $(base.options.overlay, base.el).css(base.options.anchor_x) : '0px'; + var startY = $(base.options.overlay, base.el).css(base.options.anchor_y) !== 'auto' ? $(base.options.overlay, base.el).css(base.options.anchor_y) : '0px'; var hoverState = {}; hoverState[base.options.anchor_x] = base.options.hover_x; @@ -90,7 +90,7 @@ }); break; - }; + } }; // Make it go! diff --git a/js/mosaic.1.0.1.min.js b/js/mosaic.1.0.1.min.js index 7f55ae2..049c046 100644 --- a/js/mosaic.1.0.1.min.js +++ b/js/mosaic.1.0.1.min.js @@ -1,10 +1 @@ -/* - Mosaic - Sliding Boxes and Captions jQuery Plugin - Version 1.0.1 - www.buildinternet.com/project/mosaic - - By Sam Dunn / One Mighty Roar (www.onemightyroar.com) - Released under MIT License / GPL License -*/ - -(function(a){if(!a.omr){a.omr=new Object()}a.omr.mosaic=function(c,b){var d=this;d.$el=a(c);d.el=c;d.$el.data("omr.mosaic",d);d.init=function(){d.options=a.extend({},a.omr.mosaic.defaultOptions,b);d.load_box()};d.load_box=function(){if(d.options.preload){a(d.options.backdrop,d.el).hide();a(d.options.overlay,d.el).hide();a(window).load(function(){if(d.options.options.animation=="fade"&&a(d.options.overlay,d.el).css("opacity")==0){a(d.options.overlay,d.el).css("filter","alpha(opacity=0)")}a(d.options.overlay,d.el).fadeIn(200,function(){a(d.options.backdrop,d.el).fadeIn(200)});d.allow_hover()})}else{a(d.options.backdrop,d.el).show();a(d.options.overlay,d.el).show();d.allow_hover()}};d.allow_hover=function(){switch(d.options.animation){case"fade":a(d.el).hover(function(){a(d.options.overlay,d.el).stop().fadeTo(d.options.speed,d.options.opacity)},function(){a(d.options.overlay,d.el).stop().fadeTo(d.options.speed,0)});break;case"slide":startX=a(d.options.overlay,d.el).css(d.options.anchor_x)!="auto"?a(d.options.overlay,d.el).css(d.options.anchor_x):"0px";startY=a(d.options.overlay,d.el).css(d.options.anchor_y)!="auto"?a(d.options.overlay,d.el).css(d.options.anchor_y):"0px";var f={};f[d.options.anchor_x]=d.options.hover_x;f[d.options.anchor_y]=d.options.hover_y;var e={};e[d.options.anchor_x]=startX;e[d.options.anchor_y]=startY;a(d.el).hover(function(){a(d.options.overlay,d.el).stop().animate(f,d.options.speed,d.options.easeIn)},function(){a(d.options.overlay,d.el).stop().animate(e,d.options.speed,d.options.easeOut)});break}};d.init()};a.omr.mosaic.defaultOptions={animation:"fade",speed:150,opacity:1,easeIn:"swing",easeOut:"swing",preload:0,anchor_x:"left",anchor_y:"bottom",hover_x:"0px",hover_y:"0px",overlay:".mosaic-overlay",backdrop:".mosaic-backdrop"};a.fn.mosaic=function(b){return this.each(function(){(new a.omr.mosaic(this,b))})}})(jQuery); \ No newline at end of file +!function(t){t.omr||(t.omr={}),t.omr.mosaic=function(o,n){var a=this;a.$el=t(o),a.el=o,a.$el.data("omr.mosaic",a),a.init=function(){a.options=t.extend({},t.omr.mosaic.defaultOptions,n),a.load_box()},a.load_box=function(){a.options.preload?(t(a.options.backdrop,a.el).hide(),t(a.options.overlay,a.el).hide(),t(window).load(function(){"fade"===a.options.options.animation&&0===t(a.options.overlay,a.el).css("opacity")&&t(a.options.overlay,a.el).css("filter","alpha(opacity=0)"),t(a.options.overlay,a.el).fadeIn(200,function(){t(a.options.backdrop,a.el).fadeIn(200)}),a.allow_hover()})):(t(a.options.backdrop,a.el).show(),t(a.options.overlay,a.el).show(),a.allow_hover())},a.allow_hover=function(){switch(a.options.animation){case"fade":t(a.el).hover(function(){t(a.options.overlay,a.el).stop().fadeTo(a.options.speed,a.options.opacity)},function(){t(a.options.overlay,a.el).stop().fadeTo(a.options.speed,0)});break;case"slide":var o="auto"!==t(a.options.overlay,a.el).css(a.options.anchor_x)?t(a.options.overlay,a.el).css(a.options.anchor_x):"0px",n="auto"!==t(a.options.overlay,a.el).css(a.options.anchor_y)?t(a.options.overlay,a.el).css(a.options.anchor_y):"0px",e={};e[a.options.anchor_x]=a.options.hover_x,e[a.options.anchor_y]=a.options.hover_y;var i={};i[a.options.anchor_x]=o,i[a.options.anchor_y]=n,t(a.el).hover(function(){t(a.options.overlay,a.el).stop().animate(e,a.options.speed,a.options.easeIn)},function(){t(a.options.overlay,a.el).stop().animate(i,a.options.speed,a.options.easeOut)})}},a.init()},t.omr.mosaic.defaultOptions={animation:"fade",speed:150,opacity:1,easeIn:"swing",easeOut:"swing",preload:0,anchor_x:"left",anchor_y:"bottom",hover_x:"0px",hover_y:"0px",overlay:".mosaic-overlay",backdrop:".mosaic-backdrop"},t.fn.mosaic=function(o){return this.each(function(){new t.omr.mosaic(this,o)})}}(jQuery); \ No newline at end of file