3.0-pre1

First 3.0 preview version

browse.php

@@ -4,7 +4,7 @@
   *
   *      @desc Browser calling script
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

config.php

@@ -4,7 +4,7 @@
   *
   *      @desc Base configuration file
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3
@@ -31,7 +31,7 @@
     // (F)CKEditor types
         'files'   =>  "",
         'flash'   =>  "swf",
-        'images'  =>  "*img",
+        'imagess'  =>  "*img",
 
     // TinyMCE types
         'file'    =>  "",
@@ -122,7 +122,6 @@
 
     //'_cssMinCmd' => "java -jar /path/to/yuicompressor.jar --type css {file}",
     //'_jsMinCmd' => "java -jar /path/to/yuicompressor.jar --type js {file}",
-
 );
 
 ?>

core/autoload.php

@@ -4,7 +4,7 @@
   *
   *      @desc Autoload Classes
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

core/bootstrap.php

@@ -4,7 +4,7 @@
   *
   *      @desc This file is included first, before each other
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

core/class/browser.php

@@ -4,7 +4,7 @@
   *
   *      @desc Browser actions class
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

core/class/minifier.php

@@ -4,7 +4,7 @@
   *
   *      @desc Minify JS & CSS
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

core/class/uploader.php

@@ -4,7 +4,7 @@
   *
   *      @desc Uploader class
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3
@@ -17,7 +17,7 @@
 class uploader {
 
 /** Release version */
-    const VERSION = "3.0-dev1";
+    const VERSION = "3.0-pre1";
 
 /** Config session-overrided settings
   * @var array */
@@ -279,13 +279,14 @@ public function __construct() {
                 $this->config['_check4htaccess']
             ) {
                 $htaccess = "{$this->config['uploadDir']}/.htaccess";
+                $original = $this->get_htaccess();
                 if (!file_exists($htaccess)) {
-                    if (!@file_put_contents($htaccess, $this->get_htaccess()))
+                    if (!@file_put_contents($htaccess, $original))
                         $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
                 } else {
                     if (false === ($data = @file_get_contents($htaccess)))
                         $this->backMsg("Cannot read .htaccess");
-                    if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data))
+                    if (($data != $original) && !@file_put_contents($htaccess, $original))
                         $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
                 }
             }
@@ -296,7 +297,6 @@ public function __construct() {
                     $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
             } elseif (!is_readable($this->typeDir))
                 $this->backMsg("Cannot read upload folder.");
-
         }
     }
 

core/types/type_img.php

@@ -4,7 +4,7 @@
   *
   *      @desc Image detection class
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

core/types/type_mime.php

@@ -4,7 +4,7 @@
   *
   *      @desc MIME type detection class
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

css/index.php

@@ -4,7 +4,7 @@
   *
   *      @desc Join all CSS files from current directory
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

doc/Changelog

@@ -6,9 +6,6 @@ VERSION 3.0
 * Improvements in JavaScript code to be well compressed and faster
 * Keep PNG transparency in generated thumbnails
 * New image viewer
-TODO:
-* Edit text files
-* Custom image manipulations (resize, crop, rotate)
 
 
 VERSION 2.54 - 2014-03-12

doc/README

@@ -1,4 +1,4 @@
-[===========================< KCFinder 3.0-dev1 >================================]
+[===========================< KCFinder 3.0-pre1 >================================]
 [                                                                            ]
 [                 Copyright 2010-2014 KCFinder Project                       ]
 [                     http://kcfinder.sunhater.com                           ]

integration/BolmerCMS.php

@@ -4,7 +4,7 @@
  *
  *      @desc CMS integration code: BolmerCMS
  *   @package KCFinder
- *   @version 3.0-dev1
+ *   @version 3.0-pre1
  *    @author Borisov Evgeniy <[email protected]>
  * @copyright 2010-2014 KCFinder Project
  *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

integration/drupal.php

@@ -4,7 +4,7 @@
   *
   *      @desc CMS integration code: Drupal
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Dany Alejandro Cabrera <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/010.jquery.fixes.js

@@ -2,7 +2,7 @@
   *
   *      @desc My jQuery UI & Uniform fixes
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/020.jquery.rightClick.js

@@ -2,7 +2,7 @@
   *
   *      @desc Right Click jQuery Plugin
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/021.jquery.agent.js

@@ -2,7 +2,7 @@
   *
   *      @desc User Agent jQuery Plugin
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/030.jquery.helper.js

@@ -2,7 +2,7 @@
   *
   *      @desc Helper functions integrated in jQuery
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3
@@ -30,6 +30,22 @@
         field.focus();
     };
 
+    $.fn.disableTextSelect = function() {
+        return this.each(function() {
+            if ($.agent.firefox) { // Firefox
+                $(this).css('MozUserSelect', "none");
+            } else if ($.agent.msie) { // IE
+                $(this).bind('selectstart', function() {
+                    return false;
+                });
+            } else { //Opera, etc.
+                $(this).mousedown(function() {
+                    return false;
+                });
+            }
+        });
+    };
+
     $.fn.outerSpace = function(type, mbp) {
         var selector = this.get(0),
             r = 0, x;
@@ -105,22 +121,6 @@
             $(this).fullscreen();
     };
 
-    $.fn.disableTextSelect = function() {
-        return this.each(function(){
-            if ($.agent.firefox) { // Firefox
-                $(this).css('MozUserSelect', "none");
-            } else if ($.agent.msie) { // IE
-                $(this).bind('selectstart', function() {
-                    return false;
-                });
-            } else { //Opera, etc.
-                $(this).mousedown(function() {
-                    return false;
-                });
-            }
-        });
-    };
-
     $.exitFullscreen = function() {
         var d = document,
             requestMethod =
@@ -147,16 +147,6 @@
 
     $.$ = {
 
-        unselect: function() {
-            if (document.selection && document.selection.empty)
-                document.selection.empty() ;
-            else if (window.getSelection) {
-                var sel = window.getSelection();
-                if (sel && sel.removeAllRanges)
-                sel.removeAllRanges();
-            }
-        },
-
         htmlValue: function(value) {
             return value
                 .replace(/\&/g, "&amp;")
@@ -181,7 +171,8 @@
         },
 
         basename: function(path) {
-            return /^.*\/([^\/]+)\/?$/g.test(path)
+            var expr = /^.*\/([^\/]+)\/?$/g;
+            return expr.test(path)
                 ? path.replace(expr, "$1")
                 : path;
         },

js/031.jquery.md5.js

@@ -2,7 +2,7 @@
   *
   *      @desc Helper MD5 checksum function
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/040.object.js

@@ -2,7 +2,7 @@
   *
   *      @desc Base JavaScript object properties
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/041.dialogs.js

@@ -2,7 +2,7 @@
   *
   *      @desc Dialog boxes functionality
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3
@@ -89,7 +89,9 @@ _.dialog = function(title, content, options) {
         alone: false,
         blur: false,
         legend: false,
-        nopadding: false
+        nopadding: false,
+        show: { effect: "fade", duration: 250 },
+        hide: { effect: "fade", duration: 250 }
     };
 
     $.extend(o, options);

js/050.init.js

@@ -2,7 +2,7 @@
   *
   *      @desc Object initializations
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/060.toolbar.js

@@ -2,7 +2,7 @@
   *
   *      @desc Toolbar functionality
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/070.settings.js

@@ -2,7 +2,7 @@
   *
   *      @desc Settings panel functionality
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3

js/080.files.js

@@ -2,7 +2,7 @@
   *
   *      @desc File related functionality
   *   @package KCFinder
-  *   @version 3.0-dev1
+  *   @version 3.0-pre1
   *    @author Pavel Tzonkov <[email protected]>
   * @copyright 2010-2014 KCFinder Project
   *   @license http://opensource.org/licenses/GPL-3.0 GPLv3
@@ -16,25 +16,16 @@ _.initFiles = function() {
     });
     $('#files').unbind().scroll(function() {
         _.menu.hide();
-    });
+    }).disableTextSelect();
 
     $('.file').unbind().click(function(e) {
-        $.$.unselect();
         _.selectFile($(this), e);
 
     }).rightClick(function(el, e) {
-        $.$.unselect();
         _.menuFile($(el), e);
 
     }).dblclick(function() {
-        $.$.unselect();
         _.returnFile($(this));
-
-    }).mouseup(function() {
-        $.$.unselect();
-
-    }).mouseout(function() {
-        $.$.unselect();
     });
 
     $.each(_.shows, function(i, val) {