mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1514 from owncloud/fix-setup 

Fix setup
This commit is contained in:
Lukas Reschke 2013-02-07 13:48:44 -08:00
parent 867650ee47 a82d18d2f8
commit 217328e0e3
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/js/js.js
View File

@ -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 = {};

8
core/js/setup.js
View File

@ -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>');

1
core/templates/layout.base.php
View File

@ -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; ?>

1
core/templates/layout.guest.php
View File

@ -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; ?>

1
core/templates/layout.user.php
View File

@ -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; ?>

3
lib/templatelayout.php
View File

@ -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));
}