ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed JS order, removed misplaced debug

Browse source
This commit is contained in:
Marcin Kurczewski 2013-10-09 21:31:38 +02:00
parent f71a4c6bbe
commit 35e097d0ce
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public_html/media/js/core.js
View file

@ -5,11 +5,9 @@ if ($.when.all === undefined)
var deferred = new $.Deferred(); var deferred = new $.Deferred();
$.when.apply($, deferreds).then(function() $.when.apply($, deferreds).then(function()
{ {
console.log(arguments);
deferred.resolve(Array.prototype.slice.call(arguments, 0)); deferred.resolve(Array.prototype.slice.call(arguments, 0));
}, function() }, function()
{ {
console.log(arguments);
deferred.fail(Array.prototype.slice.call(arguments, 0)); deferred.fail(Array.prototype.slice.call(arguments, 0));
}); });

6
src/Bootstrap.php
View file

@ -30,14 +30,14 @@ class Bootstrap
$this->context->title = $this->config->main->title; $this->context->title = $this->config->main->title;
$this->context->stylesheets = $this->context->stylesheets =
[ [
'../lib/jquery-ui/jquery-ui.css',
'core.css', 'core.css',
'../lib/jquery-ui/jquery-ui.css'
]; ];
$this->context->scripts = $this->context->scripts =
[ [
'core.js',
'../lib/jquery/jquery.min.js', '../lib/jquery/jquery.min.js',
'../lib/jquery-ui/jquery-ui.min.js' '../lib/jquery-ui/jquery-ui.min.js',
'core.js',
]; ];
$this->context->layoutName = isset($_GET['json']) $this->context->layoutName = isset($_GET['json'])