cvs commit: corporate_portal_templates_v2/src/jsp/javascript actions.js

[Philippe Vollenweider]

pvollenweider    2005/11/10 16:35:39 CET

  Modified files:
    src/jsp/javascript   actions.js 
  Log:
  sync with v1
  
  Revision  Changes    Path
  1.5       +19 -12    
corporate_portal_templates_v2/src/jsp/javascript/actions.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/javascript/actions.js.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: actions.js
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/javascript/actions.js,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- actions.js        29 Sep 2005 15:26:08 -0000      1.4
  +++ actions.js        10 Nov 2005 15:35:39 -0000      1.5
  @@ -499,12 +499,14 @@
   // AJAX based function to get all Actions to fill up the Action menu
   function getActionMenu (context, objectType, objectKey, definitionID, 
parentID, pageID) {
       document.body.style.cursor = "wait";
  -     try {
  -             // correct values are "POST" or "GET" (HTTP methods).
  -             var method = "POST" ;
  -             var data = "key=" + objectKey + "&type=" + objectType +
  -                             "&def=" + definitionID + "&parent=" + parentID ;
  -         var url = context + "/menu/op/edit/pid/" + pageID ;
  +    try {
  +        // correct values are "POST" or "GET" (HTTP methods).
  +        var method = "POST" ;
  +        var data = "key=" + objectKey + "&type=" + objectType +
  +                   "&def=" + definitionID + "&parent=" + parentID +
  +                   "&params=/op/edit/pid/" + pageID;
  +
  +        var url = context + "/ajaxaction/GetMenuItems";
   
                if (method == "GET") {
                        url += "?" + data;
  @@ -642,11 +644,11 @@
   
   function clipboard (context, objectKey, op, pageID) {
       document.body.style.cursor = "wait";
  -     try {
  -             // correct values are "POST" or "GET" (HTTP methods).
  -             var method = "GET" ;
  -             var data = "key=" + objectKey + "&op=" + op;
  -         var url = context + "/Jahia/engineName/clipboard/pid/" + pageID ;
  +    try {
  +        // 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 ;
   
                if (method == "GET") {
                        url += "?" + data;
  @@ -677,7 +679,12 @@
            } else {
                    req.onreadystatechange = function () {
                   if (req.readyState == 4) {
  -                             
document.getElementById('clipboard').innerHTML=objectKey;
  +                    //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";
                   }
               }