From 35e097d0ceb4d3c52e6350bb7eb640e3b5c1867c Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Wed, 9 Oct 2013 21:31:38 +0200 Subject: [PATCH] Fixed JS order, removed misplaced debug --- public_html/media/js/core.js | 2 -- src/Bootstrap.php | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/public_html/media/js/core.js b/public_html/media/js/core.js index fd38680b..9ee9dd23 100644 --- a/public_html/media/js/core.js +++ b/public_html/media/js/core.js @@ -5,11 +5,9 @@ if ($.when.all === undefined) var deferred = new $.Deferred(); $.when.apply($, deferreds).then(function() { - console.log(arguments); deferred.resolve(Array.prototype.slice.call(arguments, 0)); }, function() { - console.log(arguments); deferred.fail(Array.prototype.slice.call(arguments, 0)); }); diff --git a/src/Bootstrap.php b/src/Bootstrap.php index cbd5c2c3..771a14ed 100644 --- a/src/Bootstrap.php +++ b/src/Bootstrap.php @@ -30,14 +30,14 @@ class Bootstrap $this->context->title = $this->config->main->title; $this->context->stylesheets = [ + '../lib/jquery-ui/jquery-ui.css', 'core.css', - '../lib/jquery-ui/jquery-ui.css' ]; $this->context->scripts = [ - 'core.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'])