dpillot     2005/11/02 18:47:18 CET

  Modified files:
    src/view/jsp         actions.js 
  Log:
  fix erratic behavior of clipboard icon
  
  Revision  Changes    Path
  1.11      +41 -38    corporate_portal_templates/src/view/jsp/actions.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/actions.js.diff?r1=1.10&r2=1.11&f=h
  
  
  
  Index: actions.js
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/actions.js,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- actions.js        2 Nov 2005 16:40:31 -0000       1.10
  +++ actions.js        2 Nov 2005 17:47:18 -0000       1.11
  @@ -465,7 +465,7 @@
                return document.getElementById (ID);
        else if (bw.ie4)
                return document.all (ID);
  -     else 
  +     else
                alert ("Error: Your browser version is not supported. Please 
upgrade...");
   }
   
  @@ -474,7 +474,7 @@
        var tag = "<" + nodeName + ">";
        var start = content.indexOf (tag);
        var end   = content.indexOf ("</" + nodeName + ">");
  -     
  +
        if (start < end) {
            var values = content.substring (start + tag.length, end);
                return values.split (";;");
  @@ -488,7 +488,7 @@
        var tag = "<" + nodeName + ">";
        var start = content.indexOf (tag);
        var end   = content.indexOf ("</" + nodeName + ">");
  -     
  +
        if (start < end) {
                return content.substring (start + tag.length, end);
        } else {
  @@ -502,38 +502,38 @@
        try {
                // correct values are "POST" or "GET" (HTTP methods).
                var method = "POST" ;
  -             var data = "key=" + objectKey + "&type=" + objectType + 
  +             var data = "key=" + objectKey + "&type=" + objectType +
                                "&def=" + definitionID + "&parent=" + parentID ;
            var url = context + "/menu/op/edit/pid/" + pageID ;
  -             
  +
                if (method == "GET") {
                        url += "?" + data;
                        data = null;
                }
  -             
  +
                // Create new XMLHttpRequest request
        if (window.XMLHttpRequest) {
                req = new XMLHttpRequest ();
  -                     
  +
        } else if (window.ActiveXObject) {
                req = new ActiveXObject ("Microsoft.XMLHTTP");
  -                     
  +
        } else {
  -                     alert ("Error: Your Browser does not support 
XMLHTTPRequests, please upgrade...");  
  +                     alert ("Error: Your Browser does not support 
XMLHTTPRequests, please upgrade...");
                        return;
                }
  -             
  +
                req.open (method, url, true);
  -             
  +
                req.onreadystatechange = function () {
                        buildActionMenu();
                }
   
                if (method == "POST") {
  -                     req.setRequestHeader ("Content-type", 
"application/x-www-form-urlencoded"); 
  +                     req.setRequestHeader ("Content-type", 
"application/x-www-form-urlencoded");
                }
                req.send (data);
  -             
  +
        } catch (e) {
                alert ("Exception sending the Request: " + e);
        }
  @@ -552,54 +552,54 @@
                                var definitionID = getNodeValue (response, 
"def");
                                var parentID = getNodeValue (response, 
"parent");
                                var pageID = getNodeValue (response, "page");
  -                             
  -                             var uniqueID = objectType + "_" + objectKey + 
"_" + 
  +
  +                             var uniqueID = objectType + "_" + objectKey + 
"_" +
                                                        definitionID + "_" + 
parentID + "_" + pageID;
  -                     
  +
                                var methods = getNodeValues (response, 
"method");
                                var launchers = getNodeValues (response, 
"launcher");
                                var images = getNodeValues (response, "image");
  -                             
  +
                                var fieldset = getNodeValue (response, 
"fieldset");
                                updateFieldSet (uniqueID, fieldset);
  -                             
  +
                                addActions (uniqueID, methods, launchers, 
images);
  -                             
  +
                                changeURL (uniqueID);
  -                             
  +
                                buttonClick (uniqueID);
  -                             
  +
                        } catch (e) {
                                alert ("Exception building Action Menu: " + e);
                        }
  -                     
  +
                } else {
  -                     alert ("There was a problem processing the request. 
Status: " + 
  +                     alert ("There was a problem processing the request. 
Status: " +
                                                   req.status + ", msg: " + 
req.statusText);
                }
                document.body.style.cursor = "default";
  -     }       
  +     }
   }
   
   // Changes the default grey border. Use in case the object is locked for 
example
   function updateFieldSet (id, param) {
        // alert ("Updating fieldSet for " + id + ", param = " + param);
        if (param == null) { return; }
  -     
  +
        var setID = "fieldset_" + id;
        var setElem = getObjectById (setID);
  -     
  +
        var content;
        if (param == "complete") {
                content = "completeLocked";
  -             
  +
        } else if (param == "partial") {
                content = "partialLocked";
  -                             
  +
        } else {
                return;
        }
  -     
  +
        setElem.className = content;
   }
   
  @@ -613,21 +613,21 @@
   function addActions (id, methods, launchers, images) {
        var menuDiv = getObjectById (id);
        var content = "\n";
  -     
  +
        var i;
        for (i=0; i<methods.length; i++) {
  -             if (methods[i].length > 0) { 
  +             if (methods[i].length > 0) {
                        // alert ("Adding action: '" + methods[i] + "' in div " 
+ id);
  -                     content += printLauncher(launchers[i]) + 
printImage(images[i]) + 
  +                     content += printLauncher(launchers[i]) + 
printImage(images[i]) +
                        printMethod(methods[i]);
                }
        }
  -     menuDiv.innerHTML = content;  
  +     menuDiv.innerHTML = content;
   }
   
   // Returns a String for the Action Launcher URI
   function printLauncher (launcher) {
  -     return "   <a class=\"menuItem\" href=\"javascript:" + launcher + 
"\">\n";      
  +     return "   <a class=\"menuItem\" href=\"javascript:" + launcher + 
"\">\n";
   }
   
   // Returns a String for the Action Image
  @@ -646,7 +646,7 @@
                // correct values are "POST" or "GET" (HTTP methods).
                var method = "POST" ;
                var data = "key=" + objectKey + "&cop=" + op;
  -       var url = context + "/Jahia/op/edit/engineName/clipboard/pid/" + 
pageID ;
  +         var url = context + "/Jahia/op/edit/engineName/clipboard/pid/" + 
pageID ;
   
                if (method == "GET") {
                        url += "?" + data;
  @@ -677,9 +677,12 @@
            } else {
                    req.onreadystatechange = function () {
                   if (req.readyState == 4) {
  -
  -                    
//document.getElementById('clipboard').src="<jahia:serverHttpPath 
/>/jsp/jahia/engines/images/clipboard_next.png";
  -                    window.location.reload();
  +                //copy
  +                                 
myurl="http://"+document.location.host+"/jahia/jsp/jahia/engines/images/clipboard_next.png";;
  +                    myclip=document.getElementById('clipboard');
  +                    myclip.src=myurl;
  +                    myclip.alt="clipboard:"+objectKey;
  +                    //window.location.reload();
                       document.body.style.cursor = "default";
                   }
               }
  

Reply via email to