Changeset 1320

Timestamp:

06/16/12 10:26:04 (1 year ago)

Author:

gogo

Message:

A few more updates from github

Location:

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager

Files:

• Assets/Css/Additions.css (modified) (2 diffs)
• Assets/Css/FileManager.css (modified) (6 diffs)
• Assets/Css/FileManager_ie7.css (modified) (1 diff)
• Assets/js/milkbox/milkbox.js (modified) (1 diff)
• Source/FileManager.js (modified) (2 diffs)

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/Css/Additions.css

@@ -88 +88 @@
 }
 
-div.filemanager-dialog button {
+div.filemanager-dialog button, div.filemanager-dialog .filemanager-button {
         position: absolute;
         bottom: 15px;
@@ -112 +112 @@
         border-radius: 4px;
 }
-div.filemanager-dialog-engine-trident4 button, div.filemanager-dialog-engine-trident5 button {
+div.filemanager-dialog-engine-trident4 button, div.filemanager-dialog-engine-trident4 .filemanager-button,
+div.filemanager-dialog-engine-trident5 button, div.filemanager-dialog-engine-trident5 .filemanager-button {
         padding: 0 .25em;
         overflow: visible;
 }
 
-div.filemanager-dialog button.filemanager-dialog-decline {
+div.filemanager-dialog button.filemanager-dialog-decline, div.filemanager-dialog .filemanager-button.filemanager-dialog-decline {
         right: auto;
         left: 15px;

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/Css/FileManager.css

@@ -11 +11 @@
 div.filemanager-container,
 div.filemanager,
-div.filemanager button,
+div.filemanager button, div.filemanager .filemanager-button,
 div.filemanager label,
 div.filemanager h1 {
@@ -92 +92 @@
 }
 
-div.filemanager button {
+div.filemanager button, div.filemanager .filemanager-button {
         cursor: pointer;
         height: 22px;
@@ -110 +110 @@
         border-radius: 4px;
 }
-div.filemanager-engine-trident4 button,
-div.filemanager-engine-trident5 button {
+div.filemanager-engine-trident4 button, div.filemanager-engine-trident4 .filemanager-button,
+div.filemanager-engine-trident5 button, div.filemanager-engine-trident5 .filemanager-button {
         padding: 0 .25em;
         overflow: visible;
 }
 
-div.filemanager-menu button {
+div.filemanager-menu button, div.filemanager-menu .filemanager-button {
         float: right;
 }
 
-div.filemanager button:hover,
-div.filemanager button.hover,
-div.filemanager button:focus {
+div.filemanager button:hover, div.filemanager .filemanager-button:hover,
+div.filemanager button.hover, div.filemanager .filemanager-button.hover,
+div.filemanager button:focus, div.filemanager .filemanager-button:focus {
         border: 1px solid #5f676e;
 }
 
-div.filemanager button.disabled,
-div.filemanager button.disabled:hover,
-div.filemanager button.disabled:focus {
+div.filemanager button.disabled,       div.filemanager .filemanager-button.disabled,
+div.filemanager button.disabled:hover, div.filemanager .filemanager-button.disabled:hover,
+div.filemanager button.disabled:focus, div.filemanager .filemanager-button.disabled:focus {
         cursor: default;
         color: #666;
@@ -136 +136 @@
 }
 
-div.filemanager button.filemanager-open {
+div.filemanager button.filemanager-open, div.filemanager .filemanager-button.filemanager-open  {
         font-weight: bold;
 }
@@ -832 +832 @@
 
 /* GALLERY */
-div.filemanager button.filemanager-serialize {
+div.filemanager button.filemanager-serialize, div.filemanager .filemanager-button.filemanager-serialize {
         font-weight: bold;
 }
@@ -963 +963 @@
         border: 1px solid #bebebe;
         background: #fff;
-}
-
-div.filemanager-wrapper button {
+  
+  /* and prevent FF, Chrome, Safari et al from resizing the textarea and destroy the layout that way: */
+  resize: none;
+}
+
+div.filemanager-wrapper button, div.filemanager-wrapper .filemanager-button {
         margin: 3px 7px;
 }

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/Css/FileManager_ie7.css

@@ -29 +29 @@
 }
 
-div.filemanager button,
-div.filemanager-dialog button{
+div.filemanager button, div.filemanager .filemanager-button,
+div.filemanager-dialog button, div.filemanager-dialog .filemanager-button{
         display: inline;
         overflow: visible;
 }
 
+div.filemanager-container span.fi span {
+  overflow:hidden;
+}

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Assets/js/milkbox/milkbox.js

@@ -500 +500 @@
                 if(this.formElements.length == 0) return;
 
-                this.formElements = this.formElements.map(function(elem){
+                this.formElements = this.formElements.filter(function(elem){   
+      var vis = elem.getStyle('visibility');    
+      var dis = elem.getStyle('display');     
+      return (dis !== 'none' && vis !== 'hidden');     
+    }).map(function(elem){
                         elem.store('visibility',elem.getStyle('visibility'));
                         elem.store('display',elem.getStyle('display'));

branches/MootoolsFileManager-Update/plugins/MootoolsFileManager/mootools-filemanager/Source/FileManager.js

@@ -3250 +3250 @@
         // adds buttons to the file main menu, which onClick start a method with the same name
         addMenuButton: function(name) {
-                var el = new Element('button', {
-                        'class': 'filemanager-' + name,
-                        text: this.language[name]
+                var el = new Element('div', {
+                        'class': 'filemanager-button filemanager-' + name,
+                        text: this.language[name],
                 }).inject(this.menu, 'top');
 
@@ -3615 +3615 @@
 Asset.css(__MFM_ASSETS_DIR__+'/Css/FileManager.css');
 Asset.css(__MFM_ASSETS_DIR__+'/Css/Additions.css');
+if(Browser.ie && Browser.version <= 7) 
+{   
+  Asset.css(__MFM_ASSETS_DIR__+'/Css/FileManager_ie7.css');
+}
 Asset.javascript(__MFM_ASSETS_DIR__+'/js/jsGET.js', {
         events: {