From a374ac0fd34d8fe6eb5540617ab3f5b0a8b81095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 30 Aug 2016 13:52:28 +0200 Subject: Fixed last merge who caused CSS/JS bugs --- .../public/themes/material/js/jquery.tinydot.js | 103 --------------------- .../themes/material/js/jquery.tinydot.min.js | 1 - .../views/themes/material/layout.html.twig | 4 +- 3 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js delete mode 100644 src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js b/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js deleted file mode 100644 index bf9eadef..00000000 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js +++ /dev/null @@ -1,103 +0,0 @@ -/* - * jQuery tinydot 0.2.0 - * - * Copyright (c) Alexander Danilov - * modos189.ru - * - * Plugin website: - * tinydot.modos189.ru - * - * Licensed under the MIT license. - * http://en.wikipedia.org/wiki/MIT_License - */ - -(function( $, undef ) -{ - if ( $.fn.tinydot ) - { - return; - } - - $.fn.tinydot = function( o ) { - - var $dot = this; - $dot.child = getChildOrDie($dot); - $dot.orgContent = $($dot.child).html(); - ellipsis( $dot ); - - $dot.watch = function() - { - $(window).on('resize', function(){ - if ( watchInt ) - { - clearInterval( watchInt ); - } - watchInt = setTimeout( - function() - { - reinitialize($dot); - }, 100 - ); - }); - - return $dot; - }; - - var opts = $.extend( true, {}, $.fn.tinydot.defaults, o ), - watchInt = null; - - if ( opts.watch ) - { - $dot.watch(); - } - } - - // public - $.fn.tinydot.defaults = { - 'watch' : false - }; - - function getChildOrDie( $elem ) - { - var childrens = $elem.children(); - if (childrens.length == 0) { - // create children - var data = $($elem).html(); - $elem.html(''); - $elem.append(''); - return $elem.children('span').html(data); - } else { - return childrens[0]; - } - } - - function reinitialize( $elem ) - { - $($elem.child).html($elem.orgContent); - ellipsis( $elem ); - } - - function ellipsis( $elem ) { - var divh=$($elem).height(); - while ($($elem.child).outerHeight()>divh) { - $($elem.child).html(function (index, html) { - return html.replace(/\W*\s(\S)*$/, '...'); - }); - } - } - -})( jQuery ); - -jQuery(document).ready(function($) { - //We only invoke jQuery.tinydot on elements that have dot-ellipsis class - $(".dot-ellipsis").each(function(){ - //Checking if update on window resize required - var watch_window=$(this).hasClass("dot-resize-update"); - - //Invoking jQuery.tinydot - var x = new Object(); - if (watch_window) - x.watch='window'; - $(this).tinydot(x); - }); -}); diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js b/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js deleted file mode 100644 index 74754629..00000000 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a,b){function c(b){var c=b.children();if(0==c.length){var d=a(b).html();return b.html(""),b.append(""),b.children("span").html(d)}return c[0]}function d(b){a(b.child).html(b.orgContent),e(b)}function e(b){for(var c=a(b).height();a(b.child).outerHeight()>c;)a(b.child).html(function(a,b){return b.replace(/\W*\s(\S)*$/,"...")})}a.fn.tinydot||(a.fn.tinydot=function(b){var f=this;f.child=c(f),f.orgContent=a(f.child).html(),e(f),f.watch=function(){return a(window).on("resize",function(){h&&clearInterval(h),h=setTimeout(function(){d(f)},100)}),f};var g=a.extend(!0,{},a.fn.tinydot.defaults,b),h=null;g.watch&&f.watch()},a.fn.tinydot.defaults={watch:!1})}(jQuery),jQuery(document).ready(function(a){a(".dot-ellipsis").each(function(){var b=a(this).hasClass("dot-resize-update"),c=new Object;b&&(c.watch="window"),a(this).tinydot(c)})}); diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 6e95345c..50134357 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -7,9 +7,7 @@ {% block scripts %} {{ parent() }} - - - + {% endblock %} {% block header %} -- cgit v1.2.3