diff options
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/config.php | 2 | ||||
| -rw-r--r-- | core/js/js.js | 5 | ||||
| -rw-r--r-- | core/js/multiselect.js | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/core/js/config.php b/core/js/config.php index 53a8fb96388..dd46f7889d1 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -26,8 +26,6 @@ $array = array( "oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false', "oc_webroot" => "\"".OC::$WEBROOT."\"", "oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution - "oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')", - "oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')", "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), "dayNames" => json_encode( array( diff --git a/core/js/js.js b/core/js/js.js index 3cb4d3dd151..08b429a555b 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -7,7 +7,10 @@ */ var oc_debug; var oc_webroot; -var oc_requesttoken; + +var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user'); +var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken'); + if (typeof oc_webroot === "undefined") { oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/')); } diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 463c397d8cd..48d521e1856 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -176,10 +176,10 @@ }); button.parent().data('preventHide',false); if(settings.createText){ - var li=$('<li class="creator">+ <em>'+settings.createText+'<em></li>'); + var li=$('<li class="creator">+ '+settings.createText+'</li>'); li.click(function(event){ li.empty(); - var input=$('<input class="new">'); + var input=$('<input type="text" class="new">'); li.append(input); input.focus(); input.css('width',button.innerWidth()); |