Changeset 631

Timestamp:

01/07/07 03:02:43 (6 years ago)

Author:

ray

Message:

EFM update:

• make the files display area scale with the window
  
• prevent insertion an empty img when no image is selected, remove the selected img when url field is cleared
  
• prevent insertion of border styles in IE when no border is selected
  
• heading of popup changed from "File Manager" to "Insert Image" and "Insert File Link" respectively
  

htmlarea.js: new function HTMLArea.viewportSize()

full-screen.js: use above function to detect viewport size

Location:

trunk

Files:

• htmlarea.js (modified) (1 diff)
• plugins/ExtendedFileManager/assets/manager.js (modified) (4 diffs)
• plugins/ExtendedFileManager/extended-file-manager.js (modified) (3 diffs)
• plugins/ExtendedFileManager/manager.php (modified) (1 diff)
• plugins/FullScreen/full-screen.js (modified) (1 diff)

trunk/htmlarea.js

@@ -6776 +6776 @@
   };
 }
+// detect the size of visible area
+// when calling from a popup window, call HTMLArea.viewportSize(window) to get the size of the popup
+HTMLArea.viewportSize = function(scope)
+{
+  scope = (scope) ? scope : window;
+  var x,y;
+  if (window.innerHeight) // all except Explorer
+  {
+    x = scope.innerWidth;
+    y = scope.innerHeight;
+  }
+  else if (document.documentElement && document.documentElement.clientHeight)
+  // Explorer 6 Strict Mode
+  {
+    x = scope.document.documentElement.clientWidth;
+    y = scope.document.documentElement.clientHeight;
+  }
+  else if (document.body) // other Explorers
+  {
+    x = scope.document.body.clientWidth;
+    y = scope.document.body.clientHeight;
+  }
+  return {'x':x,'y':y};
+};
 
 // find X position of an element

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -47 +47 @@
 
 //initialise the form
+
+if (manager_mode == "link")
+{
+    var offsetForInputs = (HTMLArea.is_ie) ? 155 : 140;
+}
+else
+{
+    var offsetForInputs = (HTMLArea.is_ie) ? 220 : 200;
+}    
 init = function ()
 {
-    if (manager_mode == "link")
-      __dlg_init(null,  {width:650,height:500});
-    else
-      __dlg_init(null,  {width:650,height:560});
+    var h =  100 // space above files 
+           + 250 // files iframe
+           + offsetForInputs;
+    
+    __dlg_init(null,  {width:650,height:h});
 
     __dlg_translate('ExtendedFileManager');
@@ -294 +304 @@
             var id = fields[i];
             var el = document.getElementById(id);
-            if(id == "f_url" && el.value.indexOf('://') < 0 )
+            if(id == "f_url" && el.value.indexOf('://') < 0 && el.value )
                 param[id] = makeURL(base_url,el.value);
             else
@@ -320 +330 @@
           }
         }
-
         __dlg_close(param);
         return false;
@@ -517 +526 @@
 }
 
+
+function resize()
+{
+        var win = HTMLArea.viewportSize(window);
+        document.getElementById('imgManager').style.height = win.y - 150 - offsetForInputs + 'px';
+        
+        return true;
+}
 addEvent(window, 'load', init);
+addEvent(window, 'resize', resize);

trunk/plugins/ExtendedFileManager/extended-file-manager.js

@@ -139 +139 @@
         var img = image;
         if (!img) {
+                if ( !param.f_url ) return false;
             if (HTMLArea.is_ie) {
                 var sel = editor._getSelection();
@@ -156 +157 @@
 
         } else {
-            img.src = param.f_url;
+                if ( !param.f_url ) { // delete the image if empty url passed
+                        img.parentNode.removeChild(img);
+                        editor.updateToolbar();
+                        return false;
+                } else {
+                img.src = param.f_url;
+                }
         }
 
@@ -168 +175 @@
                 case "f_alt"    : img.alt    = value; break;
                 case "f_title"  : img.title = value; break;
-                case "f_border" :
-                    img.style.borderWidth = /[^0-9]/.test(value) ? value : (value != '') ? (parseInt(value) + 'px') :'';
-                    if(img.style.borderWidth && !img.style.borderStyle)
+                case "f_border" : 
+                    if (value)
                     {
-                        img.style.borderStyle = 'solid';
+                        img.style.borderWidth = /[^0-9]/.test(value) ? value : (value != '') ? (parseInt(value) + 'px') : '';
+                        if(img.style.borderWidth && !img.style.borderStyle)
+                        {
+                            img.style.borderStyle = 'solid';
+                        }
+                        else if (!img.style.borderWidth)
+                        {
+                                img.style.border = '';
+                        }
                     }
-                    else if (!img.style.borderWidth)
-                    {
-                        img.style.border = '';
-                    }
-                    break;
-                case "f_borderColor": img.style.borderColor = value; break;
+                break;
+                case "f_borderColor": img.style.borderColor =  value; break;
                 case "f_backgroundColor": img.style.backgroundColor = value; break;
                 case "f_align"  : img.align  = value; break;

trunk/plugins/ExtendedFileManager/manager.php

@@ -108 +108 @@
 </head>
 <body class="dialog" >
-<div class="title">File Manager</div>
+<div class="title">Insert <?php echo ($insertMode == 'image' ? 'Image' : 'File Link') ?></div>
 <form action="<?php print $IMConfig['backend_url']; ?>" id="uploadForm" method="post" enctype="multipart/form-data">
 <input type="hidden" name="__plugin" value="ExtendedFileManager" />

trunk/plugins/FullScreen/full-screen.js

@@ -57 +57 @@
     e._sizing = true;
     // Width & Height of window
-    var x,y;
-    if (window.innerHeight) // all except Explorer
-    {
-      x = window.innerWidth;
-      y = window.innerHeight;
-    }
-    else if (document.documentElement && document.documentElement.clientHeight)
-      // Explorer 6 Strict Mode
-    {
-      x = document.documentElement.clientWidth;
-      y = document.documentElement.clientHeight;
-    }
-    else if (document.body) // other Explorers
-    {
-      x = document.body.clientWidth;
-      y = document.body.clientHeight;
-    }
+    var dim = HTMLArea.viewportSize();
 
-    e.sizeEditor(x + 'px',y + 'px',true,true);
+    e.sizeEditor(dim.x + 'px',dim.y + 'px',true,true);
     e._sizing = false;
   }