commit
217328e0e3
|
@ -5,6 +5,10 @@
|
||||||
* To the end of config/config.php to enable debug mode.
|
* To the end of config/config.php to enable debug mode.
|
||||||
* The undefined checks fix the broken ie8 console
|
* 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 (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
|
||||||
if (!window.console) {
|
if (!window.console) {
|
||||||
window.console = {};
|
window.console = {};
|
||||||
|
|
|
@ -52,12 +52,10 @@ $(document).ready(function() {
|
||||||
// Save form parameters
|
// Save form parameters
|
||||||
var post = $(this).serializeArray();
|
var post = $(this).serializeArray();
|
||||||
|
|
||||||
// FIXME: This lines are breaking the installation
|
|
||||||
// Disable inputs
|
// Disable inputs
|
||||||
// $(':submit', this).attr('disabled','disabled').val('Finishing …');
|
$(':submit', this).attr('disabled','disabled').val('Finishing …');
|
||||||
// $('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
|
$('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
|
||||||
// $('#selectDbType').button('disable');
|
$('#selectDbType').buttonset('disable');
|
||||||
// $('label.ui-button', this).addClass('ui-state-disabled').attr('aria-disabled', 'true').button('disable');
|
|
||||||
|
|
||||||
// Create the form
|
// Create the form
|
||||||
var form = $('<form>');
|
var form = $('<form>');
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
<?php foreach ($_['cssfiles'] as $cssfile): ?>
|
<?php foreach ($_['cssfiles'] as $cssfile): ?>
|
||||||
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
|
|
||||||
<?php foreach ($_['jsfiles'] as $jsfile): ?>
|
<?php foreach ($_['jsfiles'] as $jsfile): ?>
|
||||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
<?php foreach($_['cssfiles'] as $cssfile): ?>
|
<?php foreach($_['cssfiles'] as $cssfile): ?>
|
||||||
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
|
|
||||||
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
||||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
<?php foreach($_['cssfiles'] as $cssfile): ?>
|
<?php foreach($_['cssfiles'] as $cssfile): ?>
|
||||||
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
|
|
||||||
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
||||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
|
@ -39,6 +39,9 @@ class OC_TemplateLayout extends OC_Template {
|
||||||
// Add the js files
|
// Add the js files
|
||||||
$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
|
$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
|
||||||
$this->assign('jsfiles', array(), false);
|
$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)) {
|
if (!empty(OC_Util::$core_scripts)) {
|
||||||
$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false));
|
$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue