Iframe height change fix.

Resize boundries are now set at (12, window.width())

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index cee04db..69c27b1 100644 (file)
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -45,7 +45,7 @@ Panel.prototype.callHook = function() {
     var noHookAction = args.splice(0,1)[0]
     var result = false;
 
     var noHookAction = args.splice(0,1)[0]
     var result = false;
 

-    // $.log('calling hook: ', hookName, 'with args: ', args);
+    $.log('calling hook: ', hookName, 'with args: ', args);

     if(this.hooks && this.hooks[hookName])
         result = this.hooks[hookName].apply(this, args);
     else if (noHookAction instanceof Function)
     if(this.hooks && this.hooks[hookName])
         result = this.hooks[hookName].apply(this, args);
     else if (noHookAction instanceof Function)


@@ -146,6 +146,7 @@ Panel.prototype.connectToolbar = function()
     var extra_buttons = $('span.panel-toolbar-extra', toolbar);
     var placeholder = $('div.panel-toolbar span.panel-toolbar-extra', this.wrap);
     placeholder.replaceWith(extra_buttons);
     var extra_buttons = $('span.panel-toolbar-extra', toolbar);
     var placeholder = $('div.panel-toolbar span.panel-toolbar-extra', this.wrap);
     placeholder.replaceWith(extra_buttons);

+    extra_buttons.hide();

 
     var action_buttons = $('button', extra_buttons);
 
 
     var action_buttons = $('button', extra_buttons);
 

diff --git a/project/static/js/editor.ui.js b/project/static/js/editor.ui.js
index 41025fa..aed0455 100755 (executable)
--- a/project/static/js/editor.ui.js
+++ b/project/static/js/editor.ui.js
@@ -15,6 +15,11 @@ Editor.prototype.setupUI = function() {
     var resize_changed =  function(event) {\r
         var old_width = parseInt(event.data.overlay.css('width'));\r
         var delta = event.pageX + event.data.hotspot_x - old_width;\r
     var resize_changed =  function(event) {\r
         var old_width = parseInt(event.data.overlay.css('width'));\r
         var delta = event.pageX + event.data.hotspot_x - old_width;\r

+\r
+        if(old_width + delta < 12) delta = 12 - old_width;\r
+        if(old_width + delta > $(window).width()) \r
+            delta = $(window).width() - old_width;\r
+        \r

         event.data.overlay.css({\r
             'width': old_width + delta\r
         });\r
         event.data.overlay.css({\r
             'width': old_width + delta\r
         });\r


@@ -135,9 +140,7 @@ Editor.prototype.setupUI = function() {
 \r
     $(document).bind('panel:contentChanged', function() {\r
         self.onContentChanged.apply(self, arguments)\r
 \r
     $(document).bind('panel:contentChanged', function() {\r
         self.onContentChanged.apply(self, arguments)\r

-    });\r
-    \r
-    \r
+    });  \r

 \r
     /*\r
      * Connect various buttons\r
 \r
     /*\r
      * Connect various buttons\r

diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index 3f74017..4a8362d 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -56,8 +56,8 @@ panel_hooks = {
        },
 
         toolbarResized: function() {
        },
 
         toolbarResized: function() {

-            $('.iframe-container', self.contentDiv).css('top',
-                    $('.toolbar', self.contentDiv).outerHeight() );
+            $('.iframe-container', this.contentDiv).css('top',
+                    $('.toolbar', this.contentDiv).outerHeight() );

         }
 };
 
         }
 };