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

Timestamp:

2013-02-28T09:30:23+13:00 (11 years ago)

Author:

sjm84

Message:

More bug fixes

File:

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

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

@@ -62 +62 @@
                 var elem = t.vElem;
                 
+                elem.detach();
                 if(pos == 0)
                 {
@@ -673 +674 @@
                     {
                         var overElement = getDeepestOverElement();
-                        if(overElement)
+                        if(overElement && overElement.getXMLNode().nodeType != 3 && checkRestricted(_xmlNode, overElement.getXMLNode()))
                         {
-                            if(overElement.getXMLNode().nodeType == 3 || !checkRestricted(_xmlNode, overElement.getXMLNode()))
-                            {
-                                return;
-                            }
-                            
                             _validDropSpot = true;
                             var overDiv = overElement.getDiv();
@@ -753 +749 @@
                     if(!_validDropSpot)
                     {
+                        _div.detach();
                         if(_origDDPosition == 0)
                         {
                             _origDDParent.prepend(_div);
                         }
-                        else if(_origDDPosition == _origDDParent.children(".veElement").length - 1)
+                        else if(_origDDPosition == _origDDParent.children(".veElement").length)
                         {
                             _origDDParent.children(".veElement").eq(_origDDPosition - 1).after(_div);