elFinder up to newly ( Studio-42/elFinder@e9d7e60 )

nao-pon · Oct 25, 2017 · 77579d0 · 77579d0
1 parent 10b9baa
commit 77579d0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/html/common/elfinder/css/elfinder.full.css b/html/common/elfinder/css/elfinder.full.css
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.1.29 (2.1 Nightly: 7571749) (2017-10-25)
+ * Version 2.1.29 (2.1 Nightly: e9d7e60) (2017-10-25)
  * http://elfinder.org
  * 
  * Copyright 2009-2017, Studio 42

diff --git a/html/common/elfinder/css/elfinder.min.css b/html/common/elfinder/css/elfinder.min.css
diff --git a/html/common/elfinder/js/elFinder.version.js b/html/common/elfinder/js/elFinder.version.js
@@ -3,5 +3,5 @@
  *
  * @type String
  **/
-elFinder.prototype.version = '2.1.29 (2.1 Nightly: 7571749)';
+elFinder.prototype.version = '2.1.29 (2.1 Nightly: e9d7e60)';
 
diff --git a/html/common/elfinder/js/elfinder.full.js b/html/common/elfinder/js/elfinder.full.js
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.1.29 (2.1 Nightly: 7571749) (2017-10-25)
+ * Version 2.1.29 (2.1 Nightly: e9d7e60) (2017-10-25)
  * http://elfinder.org
  * 
  * Copyright 2009-2017, Studio 42
@@ -8674,7 +8674,7 @@ if (!String.prototype.repeat) {
  *
  * @type String
  **/
-elFinder.prototype.version = '2.1.29 (2.1 Nightly: 7571749)';
+elFinder.prototype.version = '2.1.29 (2.1 Nightly: e9d7e60)';
 
 
 

diff --git a/html/common/elfinder/js/elfinder.min.js b/html/common/elfinder/js/elfinder.min.js
diff --git a/html/common/elfinder/js/extras/editors.default.js b/html/common/elfinder/js/extras/editors.default.js
@@ -117,10 +117,10 @@
 				file = this.file,
 				src = 'https://pixlr.com/'+mode+'/?s=c',
 				myurl = window.location.href.toString().replace(/#.*$/, ''),
-				error = function() {
+				error = function(error) {
 					container.remove();
 					node.data('loading')(true);
-					fm.error('Can not launch Pixlr.');
+					fm.error(error || 'Can not launch Pixlr.');
 				},
 				launch = function() {
 					errtm = setTimeout(error, 10000);
@@ -146,6 +146,11 @@
 						})
 						.on('load', function() {
 							errtm && clearTimeout(errtm);
+							setTimeout(function() {
+								if (container.is(':hidden')) {
+									error('Please disable your ad blocker.');
+								}
+							}, 1000);
 						})
 						.on('error', error)
 						.appendTo(elfNode.hasClass('elfinder-fullscreen')? elfNode : 'body');