Merge pull request #2252 from wallabag/fix-last-merge

Fixed last merge who caused CSS/JS bugs

6 files changed, 4 insertions, 108 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index c7419549..8dc5b83b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -45,6 +45,7 @@ module.exports = function (grunt) {
         src: [
           '<%= appDir %>/themes/material/js/init.js',
           '<%= appDir %>/themes/_global/js/restoreScroll.js',
+          'node_modules/jquery.tinydot/src/jquery.tinydot.js',
         ],
         dest: '<%= buildDir %>/material.js',
       },
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index d3cd1244..dbae5faf 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -257,7 +257,7 @@ nav input {
   display: none;
 }
 
-input-field.nav-panel-add, .input-field.nav-panel-add form {
+.input-field.nav-panel-add, .input-field.nav-panel-add form {
     height: 100%;
 }
 
diff --git a/package.json b/package.json
index 3ed7a49f..39a10e9c 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "jquery": "^2.2.1",
     "jquery-ui": "^1.10.5",
     "jquery.cookie": "^1.4.1",
+    "jquery.tinydot": "^0.2.1",
     "load-grunt-tasks": "^3.4.1",
     "materialize-css": "0.97.5",
     "npm": "^3.8.3",
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('<span />');
-            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("<span />"),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() }}
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script>
 {% endblock %}
 
 {% block header %}