diff options
| -rw-r--r-- | core/js/js.js | 4 | ||||
| -rw-r--r-- | core/js/setup.js | 8 | ||||
| -rw-r--r-- | core/templates/layout.base.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 1 | ||||
| -rw-r--r-- | lib/templatelayout.php | 3 |
6 files changed, 10 insertions, 8 deletions
diff --git a/core/js/js.js b/core/js/js.js index 6b0c289850c..c137f734d91 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -5,6 +5,10 @@ * To the end of config/config.php to enable debug mode. * The undefined checks fix the broken ie8 console */ +var oc_debug; +var oc_webroot; +var oc_requesttoken; +oc_webroot = oc_webroot || location.pathname.substr(0, location.pathname.lastIndexOf('/')); if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") { if (!window.console) { window.console = {}; diff --git a/core/js/setup.js b/core/js/setup.js index 9aded6591ca..2656cac2f45 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -52,12 +52,10 @@ $(document).ready(function() { // Save form parameters var post = $(this).serializeArray(); - // FIXME: This lines are breaking the installation // Disable inputs - // $(':submit', this).attr('disabled','disabled').val('Finishing …'); - // $('input', this).addClass('ui-state-disabled').attr('disabled','disabled'); - // $('#selectDbType').button('disable'); - // $('label.ui-button', this).addClass('ui-state-disabled').attr('aria-disabled', 'true').button('disable'); + $(':submit', this).attr('disabled','disabled').val('Finishing …'); + $('input', this).addClass('ui-state-disabled').attr('disabled','disabled'); + $('#selectDbType').buttonset('disable'); // Create the form var form = $('<form>'); diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 47fb75612cf..2049bcb36da 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -7,7 +7,6 @@ <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> - <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> <?php foreach ($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 9aabc08acec..69330aa9fce 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -8,7 +8,6 @@ <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> - <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index ecba54497c7..c8b580b5fd9 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -8,7 +8,6 @@ <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> - <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 28bdca6be0a..345f540af04 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -39,6 +39,9 @@ class OC_TemplateLayout extends OC_Template { // Add the js files $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); $this->assign('jsfiles', array(), false); + if (OC_Config::getValue('installed', false)) { + $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config')); + } if (!empty(OC_Util::$core_scripts)) { $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false)); } |