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

Timestamp:

2013-02-27T16:43:04+13:00 (11 years ago)

Author:

sjm84

Message:

Implemented the ability to restrict the types of elements are allowed inside another element as well as more bug fixing

File:

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

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

@@ -30 +30 @@
     var _transactions = new Array();
     
+    var _childRestrictions = 
+    {
+        gsf:
+        {
+            "choose-metadata":["gsf:metadata", "gsf:default"]
+        }
+    };
+    
     this.getXML = function()
     {
@@ -111 +119 @@
     }
     
+    var checkRestricted = function(child, parent)
+    {
+        var pFullNodename = parent.tagName;
+        var cFullNodename = child.tagName;
+        var pNamespace;
+        var pNodeName;
+        if(pFullNodename.indexOf(":") == -1)
+        {
+            pNamespace = "no namespace";
+            pNodeName = pFullNodename;
+        }
+        else
+        {
+            pNamespace = pFullNodename.substring(0, pFullNodename.indexOf(":"));
+            pNodeName = pFullNodename.substring(pFullNodename.indexOf(":") + 1);
+        }
+        
+        var namespaceList = _childRestrictions[pNamespace];
+        if(namespaceList)
+        {
+            var childList = namespaceList[pNodeName];
+            if(childList)
+            {
+                for(var i = 0; i < childList.length; i++)
+                {
+                    if(childList[i] == cFullNodename)
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
     var populateToolbar = function()
     {
         var elemList = 
         {
-            keys:["html", "xsl", "gsf"], // NEED TO ADD GSLIB AT SOME POINT
             html:["a", "div", "li", "script", "span", "table", "td", "tr", "ul"],
             xsl:
@@ -133 +177 @@
                 "interfaceText", "link", "meta-value", "metadata", "script",
                 "style", "switch", "template", "text", "variable"
-            ],
+            ]
         };
 
@@ -139 +183 @@
         _toolboxDiv.append(tabHolder);
 
-        for(var i = 0; i < elemList.keys.length; i++)
-        {
-            var key = elemList.keys[i];
+        for(var key in elemList)
+        {
             var currentList = elemList[key];
 
@@ -632 +675 @@
                         if(overElement)
                         {
+                            if(overElement.getXMLNode().nodeType == 3 || !checkRestricted(_xmlNode, overElement.getXMLNode()))
+                            {
+                                return;
+                            }
+                            
                             _validDropSpot = true;
                             var overDiv = overElement.getDiv();
@@ -676 +724 @@
                                 {
                                     _validDropElem = overChildren.eq(pos - 1);
+                                    //Necessary to fix a rare bug that causes pos to be off by one
                                     if(!_validDropElem.length)
                                     {