diff options
Diffstat (limited to 'module/web/static/js')
| -rw-r--r-- | module/web/static/js/utils/animations.js | 17 | ||||
| -rw-r--r-- | module/web/static/js/views/fileView.js | 6 | ||||
| -rw-r--r-- | module/web/static/js/views/linkGrabberModal.js | 3 |
3 files changed, 19 insertions, 7 deletions
diff --git a/module/web/static/js/utils/animations.js b/module/web/static/js/utils/animations.js index ea06669b3..3350dd6ae 100644 --- a/module/web/static/js/utils/animations.js +++ b/module/web/static/js/utils/animations.js @@ -65,14 +65,25 @@ define(['jquery', 'underscore', 'transit'], function(jQuery, _) { }; // TODO: carry arguments, optional height argument - jQuery.fn.slideOut = function() { + + // reset arguments, sets overflow hidden + jQuery.fn.slideOut = function(reset) { var o = jQuery(this[0]); - o.animate({height: o.data('height'), opacity: 'show'}); + o.animate({height: o.data('height'), opacity: 'show'}, function() { + // reset css attributes; + if (reset) { + this.css('overflow', ''); + this.css('height', ''); + } + }); return this; }; - jQuery.fn.slideIn = function() { + jQuery.fn.slideIn = function(reset) { var o = jQuery(this[0]); + if (reset) { + o.css('overflow', 'hidden'); + } o.animate({height: 0, opacity: 'hide'}); return this; }; diff --git a/module/web/static/js/views/fileView.js b/module/web/static/js/views/fileView.js index 32ce7d723..a8cac9503 100644 --- a/module/web/static/js/views/fileView.js +++ b/module/web/static/js/views/fileView.js @@ -5,7 +5,7 @@ define(['jquery', 'backbone', 'underscore', 'app', 'views/abstract/itemView'], return ItemView.extend({ tagName: 'li', - className: 'file-view', + className: 'file-view row-fluid', // template: _.template($("#template-file").html()), template: _.compile($("#template-file").html()), events: { @@ -67,10 +67,10 @@ define(['jquery', 'backbone', 'underscore', 'app', 'views/abstract/itemView'], visibility_changed: function(visible) { // TODO: improve animation if (visible) - this.$el.slideOut(); + this.$el.slideOut(true); else { this.$el.calculateHeight(true); - this.$el.slideIn(); + this.$el.slideIn(true); } } diff --git a/module/web/static/js/views/linkGrabberModal.js b/module/web/static/js/views/linkGrabberModal.js index abc92d4e0..ea11aa339 100644 --- a/module/web/static/js/views/linkGrabberModal.js +++ b/module/web/static/js/views/linkGrabberModal.js @@ -31,7 +31,8 @@ define(['jquery', 'underscore', 'app', 'views/abstract/modalView', 'text!tpl/def data: { name: JSON.stringify($('#inputPackageName').val()), links: JSON.stringify(['http://download.pyload.org/random.bin', 'invalid link', 'invalid link 2', 'invalid link 3', 'inavlid link 4', - 'http://download.pyload.org/random.bin', 'http://download.pyload.org/random.bin', 'http://download.pyload.org/random.bin']) + 'http://download.pyload.org/random.bin', 'http://download.pyload.org/random.bin', 'http://download.pyload.org/random.bin', + 'A really really long invalid url that should exceed length of most of the urls by far and split into two lines']) }, success: function() { App.vent.trigger('package:added'); |