From 5192cfbf804e63a435ea657c63865355422382a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Thu, 10 Jul 2014 09:17:31 +0200 Subject: [PATCH 1/1] Image editor fix: bring back horizontal scrollbar in motifs and objects perspective --- apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html | 6 ++---- redakcja/static/js/wiki_img/view_editor_motifs.js | 7 +++++++ redakcja/static/js/wiki_img/view_editor_objects.js | 7 +++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html b/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html index 72588885..c064505d 100644 --- a/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html +++ b/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html @@ -11,9 +11,7 @@ -
-
- Tagged image -
+
+ Tagged image
diff --git a/redakcja/static/js/wiki_img/view_editor_motifs.js b/redakcja/static/js/wiki_img/view_editor_motifs.js index 22331c5a..ad60c229 100644 --- a/redakcja/static/js/wiki_img/view_editor_motifs.js +++ b/redakcja/static/js/wiki_img/view_editor_motifs.js @@ -8,6 +8,8 @@ var self = this; self.$tag_name = $('#motifs-editor .tag-name'); + self.$toolbar = $('#motifs-editor .toolbar'); + self.$scrolled = $('#motifs-editor .scrolled'); withThemes(function(canonThemes){ self.$tag_name.autocomplete(canonThemes, { autoFill: true, @@ -33,6 +35,7 @@ if (window.confirm("Czy na pewno chcesz usunąć ten motyw?")) { $(this).prev().remove(); $(this).remove(); + self._refreshLayout(); } self._resetSelection(); return false; @@ -70,6 +73,9 @@ self.ias.setOptions({ hide: true }); } + MotifsPerspective.prototype._refreshLayout = function() { + this.$scrolled.css({top: this.$toolbar.height()}); + }; MotifsPerspective.prototype._push = function(name, x1, y1, x2, y2) { var $e = $('') @@ -78,6 +84,7 @@ $e.data('coords', [x1, y1, x2, y2]); this.$objects_list.append($e); this.$objects_list.append('(x) '); + this._refreshLayout(); } diff --git a/redakcja/static/js/wiki_img/view_editor_objects.js b/redakcja/static/js/wiki_img/view_editor_objects.js index bd0af094..b0cf2a9d 100644 --- a/redakcja/static/js/wiki_img/view_editor_objects.js +++ b/redakcja/static/js/wiki_img/view_editor_objects.js @@ -8,6 +8,8 @@ var self = this; self.$tag_name = $('#objects-editor .tag-name'); + self.$toolbar = $('#objects-editor .toolbar'); + self.$scrolled = $('#objects-editor .scrolled'); self.$objects_list = $('#objects-editor .objects-list'); self.x1 = null; @@ -24,6 +26,7 @@ if (window.confirm("Czy na pewno chcesz usunąć ten obiekt?")) { $(this).prev().remove(); $(this).remove(); + self._refreshLayout(); } self._resetSelection(); return false; @@ -61,6 +64,9 @@ self.ias.setOptions({ hide: true }); } + ObjectsPerspective.prototype._refreshLayout = function() { + this.$scrolled.css({top: this.$toolbar.height()}); + }; ObjectsPerspective.prototype._push = function(name, x1, y1, x2, y2) { var $e = $('') @@ -69,6 +75,7 @@ $e.data('coords', [x1, y1, x2, y2]); this.$objects_list.append($e); this.$objects_list.append('(x) '); + this._refreshLayout(); } -- 2.20.1