Skip to content

Compare: Integration with CodeIgniter

New page
7 changes: 4 additions & 3 deletions Integration-with-CodeIgniter.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class Elfinder_lib extends CI_Controller {
define('returnVoid', void 0);
(function(){
var // elFinder version
elver = '2.1.27',
elver = '<?php echo elFinder::getApiFullVersion()?>',
// jQuery and jQueryUI version
jqver = '3.2.1',
uiver = '1.12.1',
Expand Down Expand Up @@ -172,7 +172,7 @@ class Elfinder_lib extends CI_Controller {
delete fm.options.rawStringDecoder;
if (fm.lang === 'jp') {
require(
[ 'extras/encoding-japanese.min' ],
[ 'encoding-japanese' ],
function(Encoding) {
if (Encoding.convert) {
fm.options.rawStringDecoder = function(s) {
Expand Down Expand Up @@ -217,7 +217,8 @@ class Elfinder_lib extends CI_Controller {
paths : {
'jquery' : '//cdnjs.cloudflare.com/ajax/libs/jquery/'+(ie8? '1.12.4' : jqver)+'/jquery.min',
'jquery-ui': '//cdnjs.cloudflare.com/ajax/libs/jqueryui/'+uiver+'/jquery-ui.min',
'elfinder' : 'elfinder.min'
'elfinder' : 'elfinder.min',
'encoding-japanese': '//cdn.rawgit.com/polygonplanet/encoding.js/master/encoding.min'
},
waitSeconds : 10 // optional
});
Expand Down