[js:core] bugfix of registration of fm.decodeRawString by fm.options.rawStringDecoder

Author: nao-pon

elfinder.legacy.html

@@ -50,15 +50,14 @@
 					function(fm, extraObj) {
 						// `init` event callback function
 						fm.bind('init', function() {
-							// Optional for Japanese decoder "extras/encoding-japanese.min"
-							delete fm.options.rawStringDecoder;
+							// Optional for Japanese decoder "encoding-japanese.js"
 							if (fm.lang === 'jp') {
 								fm.loadScript(
-									[ fm.baseUrl + 'js/extras/encoding-japanese.min.js' ],
+									[ '//cdn.rawgit.com/polygonplanet/encoding.js/master/encoding.min.js' ],
 									function() {
 										if (window.Encoding && Encoding.convert) {
 											fm.options.rawStringDecoder = function(s) {
-												return Encoding.convert(s,{to:'UNICODE',type:'string'});
+												return Encoding.convert(s, {to:'UNICODE',type:'string'});
 											};
 										}
 									},

js/elFinder.js

@@ -3554,7 +3554,7 @@ var elFinder = function(node, opts, bootCallback) {
 	 * @param  String str
 	 * @return String
 	 */
-	this.decodeRawString = $.isFunction(this.options.rawStringDecoder)? this.options.rawStringDecoder : function(str) {
+	this.decodeRawString = function(str) {
 		var charCodes = function(str) {
 			var i, len, arr;
 			for (i=0,len=str.length,arr=[]; i<len; i++) {
@@ -4676,6 +4676,11 @@ var elFinder = function(node, opts, bootCallback) {
 					},
 					toChkTh = {};
 
+				// regist decodeRawString function
+				if (self.options.rawStringDecoder && $.isFunction(self.options.rawStringDecoder)) {
+					self.decodeRawString = self.options.rawStringDecoder;
+				}
+				
 				// re-calculate elFinder node z-index
 				self.zIndexCalc();