Merge remote-tracking branch 'origin/master'

[redakcja.git] / redakcja / static / js / wiki_img / view_editor_objects.js

diff --git a/redakcja/static/js/wiki_img/view_editor_objects.js b/redakcja/static/js/wiki_img/view_editor_objects.js
index 5cf014f..b0cf2a9 100644 (file)
--- 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');
             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;
             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();
                     if (window.confirm("Czy na pewno chcesz usunąć ten obiekt?")) {
                         $(this).prev().remove();
                         $(this).remove();

+                        self._refreshLayout();

                     }
                     self._resetSelection();
                     return false;
                     }
                     self._resetSelection();
                     return false;


@@ -61,6 +64,9 @@
         self.ias.setOptions({ hide: true });
     }
 
         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 = $('<span class="image-object"></span>')
 
     ObjectsPerspective.prototype._push = function(name, x1, y1, x2, y2) {
         var $e = $('<span class="image-object"></span>')


@@ -68,7 +74,8 @@
         if (x1 !== null)
             $e.data('coords', [x1, y1, x2, y2]);
         this.$objects_list.append($e);
         if (x1 !== null)
             $e.data('coords', [x1, y1, x2, y2]);
         this.$objects_list.append($e);

-        this.$objects_list.append('<span class="delete">(x)</span>');
+        this.$objects_list.append('<span class="delete">(x) </span>');
+        this._refreshLayout();

     }
 
 
     }