Changeset 447 for trunk/plugins/ImageManager/assets

Timestamp:

01/13/06 13:53:36 (14 years ago)

Author:

gogo

Message:

Enhancements to allow using the manager in a List/Details? mode rather than "thumbs". Set $IMConfigViewMode? = 'details'; in the
configuration to try it out. Defaults to thumbs to avoid surprising people :-)

ticket:649

Location:

trunk/plugins/ImageManager/assets

Files:

• imagelist.css (modified) (1 diff)
• images.js (modified) (1 diff)
• manager.js (modified) (4 diffs)

trunk/plugins/ImageManager/assets/imagelist.css

@@ -41 +41 @@
   border:none;
 }
+.listview { width:100% }
+.listview td, .listview th { text-align:left; font-size:small; }
+.listview td.actions { text-align:right; }
+.listview td.actions img { border:0px; }

trunk/plugins/ImageManager/assets/images.js

@@ -56 +56 @@
                 var obj = topDoc.getElementById('orginal_width'); obj.value = width;
                 var obj = topDoc.getElementById('orginal_height'); obj.value = height;          
+    // Set preview for the selected
+    topDoc.getElementById('f_preview').src = window.parent._backend_url + '__function=thumbs&img=' + filename;
+    
     update_selected();
         }

trunk/plugins/ImageManager/assets/manager.js

@@ -56 +56 @@
                 if (param) 
                 {
-      var image_src = param.f_url;
       var image_regex = new RegExp( '(https?://[^/]*)?' + base_url.replace(/\/$/, '') );
       param.f_url = param.f_url.replace( image_regex, "" );
 
+      // The image URL may reference one of the automatically resized images 
+      // (when the user alters the dimensions in the picker), clean that up
+      // so it looks right and we get back to a normal f_url
+      var rd = _resized_dir.replace(HTMLArea.RE_Specials, '\\$1');
+      var rp = _resized_prefix.replace(HTMLArea.RE_Specials, '\\$1');
+      var dreg = new RegExp('^(.*/)' + rd + '/' + rp + '_([0-9]+)x([0-9]+)_([^/]+)$');
+  
+      if(dreg.test(param.f_url))
+      {
+        param.f_url    = RegExp.$1 + RegExp.$4;
+        param.f_width  = RegExp.$2;
+        param.f_height = RegExp.$3;
+      }
+      
       for (var id in param)
       {
@@ -76 +89 @@
 
       // Locate to the correct directory
-      var rd = _resized_dir.replace(HTMLArea.RE_Specials, '\\$1');
-      var rp = _resized_prefix.replace(HTMLArea.RE_Specials, '\\$1');
-      var dreg = new RegExp('^(.*/)(?:'+rd+')?(?:'+rp+'_[0-9]+x[0-9]+_)?([^/]+)$');
-
+      var dreg = new RegExp('^(.*/)([^/]+)$');
       if(dreg.test(param['f_url']))
       {
@@ -93 +103 @@
         }
       }
+      document.getElementById('f_preview').src = _backend_url + '__function=thumbs&img=' + param.f_url;      
                 }
 
@@ -98 +109 @@
 
     // For some reason dialog is not shrinkwrapping correctly in IE so we have to explicitly size it for now.
-    if(HTMLArea.is_ie) window.resizeTo(600, 460);
+    // if(HTMLArea.is_ie) window.resizeTo(600, 460);
         };