Changeset 799

Timestamp:

03/27/07 18:30:28 (2 years ago)

Author:

ray

Message:

Ticket #908 Prompts broken in IE7: fixed for EFM & ImageManager

Location:

trunk/plugins

Files:

• ExtendedFileManager/assets/images.js (modified) (2 diffs)
• ExtendedFileManager/assets/manager.js (modified) (2 diffs)
• ExtendedFileManager/assets/popup.js (modified) (1 diff)
• ExtendedFileManager/lang/de.js (modified) (1 diff)
• ExtendedFileManager/prompt.html (added)
• ImageManager/assets/manager.js (modified) (1 diff)
• ImageManager/newFolder.html (added)

trunk/plugins/ExtendedFileManager/assets/images.js

@@ -32 +32 @@
 
 function renameFile(oldPath) {
-    // strip directory and extension
-    var oldName=oldPath.replace(/.*%2F/,'').replace(/\..*$/,'');
-    var newName = prompt(i18n('Please enter new name for this file...'), oldName);
-
+ // strip directory and extension
+  var oldName=oldPath.replace(/.*%2F/,'').replace(/\..*$/,'');
+  
+  var rename = function (newName)
+  {
     if(newName == '' || newName == null || newName == oldName)
     {
@@ -47 +48 @@
     var viewtype = selection.options[selection.selectedIndex].value;
     location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&rename="+oldPath+"&renameTo="+newName+"&viewtype="+viewtype;
-}
-function renameDir(oldName) {
-    // strip directory and extension
-   
+  }
+  
+   // IE7 has crippled the prompt()
+  if ( Xinha.ie_version > 6 )
+  {
+    popupPrompt(i18n("Please enter new name for this file..."), oldName, rename, i18n("Rename"));
+  }
+  else
+  {
+    var newName = prompt(i18n('Please enter new name for this file...'), oldName);
+    rename(newName);
+  }
+}
+function renameDir(oldName) 
+{
+  // strip directory and extension
+
+  function rename(newName)
+  {
+    if(newName == '' || newName == null || newName == oldName)
+    {
+      alert(i18n('Cancelled rename.'));
+      return false;
+    }
+    var mode=window.top.document.getElementById('manager_mode').value;
+    var selection = window.top.document.getElementById('dirPath');
+    var dir = selection.options[selection.selectedIndex].value;
+    selection = window.top.document.getElementById('viewtype');
+    var viewtype = selection.options[selection.selectedIndex].value;
+    location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&rename="+oldName+"&renameTo="+newName+"&viewtype="+viewtype;
+  }
+  
+  // IE7 has crippled the prompt()
+  if ( Xinha.ie_version > 6 )
+  {
+    popupPrompt(i18n('Please enter new name for this folder...'), oldName, rename, i18n("Rename"));
+  }
+  else
+  {
     var newName = prompt(i18n('Please enter new name for this folder...'), oldName);
-
-    if(newName == '' || newName == null || newName == oldName)
-    {
-        alert(i18n('Cancelled rename.'));
-        return false;
-    }
-    var mode=window.top.document.getElementById('manager_mode').value;
-    var selection = window.top.document.getElementById('dirPath');
-    var dir = selection.options[selection.selectedIndex].value;
-    selection = window.top.document.getElementById('viewtype');
-    var viewtype = selection.options[selection.selectedIndex].value;
-    location.href = _backend_url + "__function=images&mode="+mode+"&dir="+dir+"&rename="+oldName+"&renameTo="+newName+"&viewtype="+viewtype;
+    rename(newName);
+  }
 }
 function copyFile(file,action)

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -518 +518 @@
 function newFolder()
 {
-    var folder = prompt(i18n('Please enter name for new folder...'), i18n('Untitled'));
+  function createFolder(folder)
+  {
     var selection = document.getElementById('dirPath');
     var dir = selection.options[selection.selectedIndex].value;
@@ -524 +525 @@
     if(folder == thumbdir)
     {
-        alert(i18n('Invalid folder name, please choose another folder name.'));
-        return false;
+      alert(i18n('Invalid folder name, please choose another folder name.'));
+      return false;
     }
 
     if (folder && folder != '' && typeof imgManager != 'undefined')
-        imgManager.newFolder(dir, encodeURI(folder));
+    {
+      imgManager.newFolder(dir, encodeURI(folder));
+    }
+  }
+    // IE7 has crippled the prompt()
+  if ( Xinha.ie_version > 6 )
+  {
+    popupPrompt(i18n('Please enter name for new folder...'), i18n('Untitled'), createFolder, i18n("New Folder"));
+  }
+  else
+  {
+    var folder = prompt(i18n('Please enter name for new folder...'), i18n('Untitled'));
+    createFolder(folder);
+  }
 }
 

trunk/plugins/ExtendedFileManager/assets/popup.js

@@ -48 +48 @@
     window.close();
 }
+
+function popupPrompt( prompt, value, handler, title)
+{
+  
+    Dialog("prompt.html", function(param)
+    {
+      if (!param) // user must have pressed Cancel
+      {
+        return false;
+      }
+      else
+      {
+        handler (param.value);
+      }
+    }, {prompt:prompt,value:value,title:title});
+}

trunk/plugins/ExtendedFileManager/lang/de.js

@@ -89 +89 @@
   "Other" : "Andere...",
   "Rename": "Umbenennen",
-  "Please enter new name for this file...": "Bite neuen Namen fÃŒr diese Datei eingeben...",
+  "Please enter new name for this file...": "Bitte neuen Namen fÃŒr diese Datei eingeben...",
   "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Umbenennen nicht möglich. Evtl. Dateiname schon vorhanden oder keine Schreibrechte.",
   "Cancelled rename.": "Umbenennen abgebrochen.",

trunk/plugins/ImageManager/assets/manager.js

@@ -293 +293 @@
 
 
-        function newFolder() 
-        {
-     var folder = prompt(i18n('Please enter name for new folder...'), i18n('Untitled'));
-                var selection = document.getElementById('dirPath');
-                var dir = selection.options[selection.selectedIndex].value;
-
-                                if(folder == thumbdir)
+        function newFolder()
+        {
+                function createFolder(folder)
+                {
+                        var selection = document.getElementById('dirPath');
+                        var dir = selection.options[selection.selectedIndex].value;
+
+                        if(folder == thumbdir)
+                        {
+                                alert(i18n('Invalid folder name, please choose another folder name.'));
+                                return false;
+                        }
+
+                        if (folder && folder != '' && typeof imgManager != 'undefined')
+                        {
+                                imgManager.newFolder(dir, encodeURI(folder));
+                        }
+                }
+                // IE7 has crippled the prompt()
+                if (Xinha.ie_version > 6)
+                {
+                        Dialog("newFolder.html", function(param)
+                        {
+                                if (!param) // user must have pressed Cancel
                                 {
-                                        alert(i18n('Invalid folder name, please choose another folder name.'));
                                         return false;
                                 }
-
-                                if (folder && folder != '' && typeof imgManager != 'undefined') 
-                                        imgManager.newFolder(dir, encodeURI(folder)); 
-   }
-         addEvent(window, 'load', init);
+                                else
+                                {
+                                        var folder = param['f_foldername'];
+                                        createFolder(folder);
+                                }
+                        }, null);
+                }
+                else
+                {
+                        var folder = prompt(i18n('Please enter name for new folder...'), i18n('Untitled'));
+                        createFolder(folder);
+                }
+        }
+        addEvent(window, 'load', init);