diff --git a/htdocs/themes/stikkedizr/js/stikked.js b/htdocs/themes/stikkedizr/js/stikked.js index 7f26c92..d1a118d 100644 --- a/htdocs/themes/stikkedizr/js/stikked.js +++ b/htdocs/themes/stikkedizr/js/stikked.js @@ -161,7 +161,7 @@ ST.crypto = function() { } else { try { var $code = $('#code'); - var encrypted = $code.val().replace(/\n/g, ''); + var encrypted = $code.text().replace(/\n/g, ''); var decrypted = CryptoJS.AES.decrypt(encrypted, key).toString(CryptoJS.enc.Utf8) + ''; decrypted = LZString.decompressFromBase64(decrypted); $code.val(decrypted); diff --git a/htdocs/themes/stikkedizr/views/defaults/footer.php b/htdocs/themes/stikkedizr/views/defaults/footer.php index 31c8380..aff2c0d 100644 --- a/htdocs/themes/stikkedizr/views/defaults/footer.php +++ b/htdocs/themes/stikkedizr/views/defaults/footer.php @@ -7,6 +7,11 @@ if(isset($codemirror_modes)){ echo '
'; } +//ace modes +if(isset($ace_modes)){ + echo ' '; +} + //stats $this->load->view('defaults/stats'); @@ -16,9 +21,15 @@ $this->carabiner->js('jquery.timers.js'); $this->carabiner->js('crypto-js/rollups/aes.js'); $this->carabiner->js('lz-string-1.3.3-min.js'); $this->carabiner->js('filereader.js'); +$this->carabiner->js('linkify.min.js'); +$this->carabiner->js('linkify-jquery.min.js'); +if(config_item('js_editor') == 'codemirror') { + $this->carabiner->js('codemirror/codemirror.js'); +} +if(config_item('js_editor') == 'ace') { + $this->carabiner->js('ace/ace.js'); +} $this->carabiner->js('stikked.js'); -$this->carabiner->js('codemirror/codemirror.js'); -$this->carabiner->js('codemirror_exec.js'); $this->carabiner->display('js'); diff --git a/htdocs/themes/stikkedizr/views/view/view.php b/htdocs/themes/stikkedizr/views/view/view.php index f5ee807..70b602f 100644 --- a/htdocs/themes/stikkedizr/views/view/view.php +++ b/htdocs/themes/stikkedizr/views/view/view.php @@ -60,7 +60,7 @@ if(isset($insert)){ -