Changeset 27072 for main/trunk

Timestamp:

2013-03-13T10:43:08+13:00 (11 years ago)

Author:

sjm84

Message:

Various fixes and resizing will now only be done if it is necessary

File:

• main/trunk/greenstone3/web/interfaces/default/js/visual-xml-editor.js (modified) (13 diffs)

main/trunk/greenstone3/web/interfaces/default/js/visual-xml-editor.js

@@ -340 +340 @@
 
         _toolboxDiv.tabs();
+        
+        customCreateButton.button();
     }
 
@@ -420 +422 @@
     var addToOverList = function(veElement)
     {
+        if(veElement.getDiv().data("toolbar"))
+        {
+            return;
+        }
+    
         for(var i = 0; i < _overList.length; i++)
         {
@@ -562 +569 @@
     
         var _textEditor = $("<div>");
-        var textTitle = $("<div>Text:</div>");
+        var _textTitle = $("<div>Text:</div>");
         var _nodeText = $("<div>");
         _nodeText.text(_xmlNode.nodeValue);
 
-        _textEditor.append(textTitle);
+        _textEditor.append(_textTitle);
         _textEditor.append(_nodeText);
         
-        var editButton = $("<button>edit text</button>");
-        editButton.click(function()
-        {
-            if(editButton.text() == "edit text")
+        var _editButton = $("<button>Edit text</button>");
+        _editButton.click(function()
+        {
+            if(_editButton.button("option", "label") == "Edit text")
             {
                 _thisNode.editMode();
@@ -581 +588 @@
             }
         });
-        _textEditor.append(editButton);
+        _textEditor.append(_editButton);
         
         this.editMode = function()
@@ -591 +598 @@
             _nodeText.text("");
             _nodeText.append(textArea);
-            editButton.text("done");
+            _editButton.button("option", "label", "Done");
         }
 
@@ -611 +618 @@
             _nodeText.empty();
             _nodeText.text(newValue);
-            editButton.text("edit text");
+            _editButton.button("option", "label", "Edit text");
         }
 
         this.getDiv = function()
         {
+            //A hack to make sure the edit text button is styled correctly
+            setTimeout(function(){_editButton.button()}, 1);
             return _textEditor;
         }
@@ -964 +973 @@
                         _div.data("parentVEElement").setShortName(false);
                     }
-                    
-                    _div.data("dragging", false);
-                    _div.data("toolbar", false);
 
                     _div.css("border", "1px solid black");
@@ -972 +978 @@
                     
                     //If the element was not dropped in a valid place then put it back
-                    if(!_validDropSpot)
+                    if(!_validDropSpot && !_div.data("toolbar"))
                     {
                         _div.detach();
@@ -1015 +1021 @@
                     }
                     
+                    _div.data("dragging", false);
+                    _div.data("toolbar", false);
+                    
                     _overList = new Array();
                     _overList.freeSpaces = new Array();
@@ -1142 +1151 @@
                 _infoDiv.append(addSelect);
                 _infoDiv.append(addButton);
+                addButton.button();
             }
 
@@ -1206 +1216 @@
                 _div.prevBorder = _div.css("border");
                 _div.css("border", "red solid 1px");
-                
+
                 _div.data("parentVEElement").focus();
                 _div.data("parentVEElement").populateInformationDiv();
@@ -1212 +1222 @@
                 event.stopPropagation();
             });
+        }
+        
+        var checkResizeNecessary = function()
+        {
+            var elemsToCheck = _div.find(".veTitleElement");
+            for(var i = 0; i < elemsToCheck.length; i++)
+            {
+                var titleElem = elemsToCheck.eq(i);
+                titleElem.html("<span>" + titleElem.html() + "</span>");
+                var titleSpan = titleElem.children("span");
+
+                var resizeNecessary = false;
+                if(titleSpan.width() >= titleElem.parent().width())
+                {
+                    resizeNecessary = true;
+                }
+                titleElem.html(titleSpan.text());
+                
+                if(resizeNecessary)
+                {
+                    return true;
+                }
+            }
+            return false;
         }
 
@@ -1244 +1278 @@
         this.focus = function()
         {
-            _div.data("parentVEElement").expand();
-            
-            var parents = _div.parents(".veElement");
-            parents.each(function()
-            {
-                $(this).data("parentVEElement").expand();
-            });
+            if(checkResizeNecessary())
+            {
+                _div.data("parentVEElement").expand();
+                
+                var parents = _div.parents(".veElement");
+                parents.each(function()
+                {
+                    $(this).data("parentVEElement").expand();
+                });
+            }
 
             _div.data("parentVEElement").evenlyDistributeChildren();