Bump to jquery ui 1.8.24, fix JS and CSS load issues

2025-10-12 12:33:26 +00:00 · 2013-06-13 12:26:52 +02:00
parent 25a00d3c6e
commit bfa28e0fd0
27 changed files with 11426 additions and 395 deletions
--- a/lib/Alchemy/Phrasea/Command/Setup/LessCompile.php
+++ b/lib/Alchemy/Phrasea/Command/Setup/LessCompile.php
@@ -36,8 +36,8 @@ class LessCompile extends Command
        $files = array(
            $this->container['root.path'] . '/www/skins/build/login.css' => realpath($this->container['root.path'] . '/www/skins/login/less/login.less'),
            $this->container['root.path'] . '/www/skins/build/account.css' => realpath($this->container['root.path'] . '/www/skins/account/account.less'),
-            $this->container['root.path'] . '/www/skins/build/bootstrap.css' => realpath($this->container['root.path'] . '/www/assets/bootstrap/less/bootstrap.less'),
-            $this->container['root.path'] . '/www/skins/build/bootstrap-responsive.css' => realpath($this->container['root.path'] . '/www/assets/bootstrap/less/responsive.less'),
+            $this->container['root.path'] . '/www/skins/build/bootstrap/css/bootstrap.css' => realpath($this->container['root.path'] . '/www/assets/bootstrap/less/bootstrap.less'),
+            $this->container['root.path'] . '/www/skins/build/bootstrap/css/bootstrap-responsive.css' => realpath($this->container['root.path'] . '/www/assets/bootstrap/less/responsive.less'),
        );

        $output->writeln('Building Assets...');
@@ -45,6 +45,7 @@ class LessCompile extends Command
        $failures = 0;
        $errors = array();
        foreach ($files as $buildFile => $lessFile) {
+            $this->container['filesystem']->mkdir(dirname($buildFile));
            $output->writeln(sprintf('Building %s', basename($lessFile)));
            $builder = ProcessBuilder::create(array(
                'recess',
@@ -61,6 +62,16 @@ class LessCompile extends Command
            file_put_contents($buildFile, $process->getOutput());
        }

+        $copies = array(
+            $this->container['root.path'] . '/www/assets/bootstrap/img/glyphicons-halflings-white.png' => $this->container['root.path'] . '/www/skins/build/bootstrap/img/glyphicons-halflings-white.png',
+            $this->container['root.path'] . '/www/assets/bootstrap/img/glyphicons-halflings.png' => $this->container['root.path'] . '/www/skins/build/bootstrap/img/glyphicons-halflings.png',
+        );
+
+        foreach ($copies as $source => $target) {
+            $this->container['filesystem']->mkdir(dirname($target));
+            $this->container['filesystem']->copy($source, $target);
+        }
+
        if (0 === $failures) {
            $output->writeln('<info>Build done !</info>');

--- a/lib/Alchemy/Phrasea/Controller/Minifier.php
+++ b/lib/Alchemy/Phrasea/Controller/Minifier.php
@@ -45,6 +45,7 @@ class Minifier implements ControllerProviderInterface
            $min_serveOptions['bubbleCssImports'] = false;

            if ($app['debug']) {
+                // may cause js errors
                $min_serveOptions['debug'] = true;
                $min_serveOptions['maxAge'] = 0;
            } else {
@@ -137,8 +138,7 @@ class Minifier implements ControllerProviderInterface
            }

            return $response;
-        })
-            ->bind('minifier');
+        })->bind('minifier');

        return $controllers;
    }
--- a/lib/conf.d/minifyGroupsConfig.php
+++ b/lib/conf.d/minifyGroupsConfig.php
@@ -16,6 +16,7 @@ $groups = array(
        '//assets/font-awesome/css/font-awesome.css',
    ),
    'bootstrap_js' => array(
+        '//assets/bootstrap/js/bootstrap-tooltip.js',
        '//assets/bootstrap/js/bootstrap-affix.js',
        '//assets/bootstrap/js/bootstrap-alert.js',
        '//assets/bootstrap/js/bootstrap-button.js',
@@ -26,7 +27,6 @@ $groups = array(
        '//assets/bootstrap/js/bootstrap-popover.js',
        '//assets/bootstrap/js/bootstrap-scrollspy.js',
        '//assets/bootstrap/js/bootstrap-tab.js',
-        '//assets/bootstrap/js/bootstrap-tooltip.js',
        '//assets/bootstrap/js/bootstrap-transition.js',
        '//assets/bootstrap/js/bootstrap-typeahead.js',
    ),
@@ -56,10 +56,9 @@ $groups = array(
        , '//include/jquery.image_enhancer.js'
        , '//include/jslibs/jquery.contextmenu_scroll.js'),
    'admin' => array(
-        '//assets/jquery/jquery.js'
-        , '//include/jslibs/jquery.validate.js'
+        '//include/jslibs/jquery.validate.js'
        , '//include/jslibs/jquery.validate.password.js'
-        , '//include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js'
+        , '//include/jslibs/jquery-ui-1.8.24.js'
        , '//include/jslibs/jquery.cookie.js'
        , '//include/jslibs/jquery-treeview/jquery.treeview.js'
        , '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js'
--- a/templates/mobile/api/auth/end_user_authorization.html.twig
+++ b/templates/mobile/api/auth/end_user_authorization.html.twig
@@ -9,8 +9,8 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />

        <!-- styles -->
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap.css' }) }}" />
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap-responsive.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
        <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />

        <!-- All JavaScript at the bottom, except this Modernizr build.
--- a/templates/mobile/api/auth/native_app_access_token.html.twig
+++ b/templates/mobile/api/auth/native_app_access_token.html.twig
@@ -15,8 +15,8 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />

        <!-- styles -->
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap.css' }) }}" />
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap-responsive.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
        <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />

        <!-- All JavaScript at the bottom, except this Modernizr build.
--- a/templates/web/admin/subdefs.html.twig
+++ b/templates/web/admin/subdefs.html.twig
@@ -12,7 +12,7 @@

 {% block javascript %}
  <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/path_files_tests.jquery.js' }) }}"></script>
-  <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+  <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
  <script type="text/javascript">
    $(document).ready(function(){
      $('.path_testable').path_file_test();
--- a/templates/web/api/auth/end_user_authorization.html.twig
+++ b/templates/web/api/auth/end_user_authorization.html.twig
@@ -9,8 +9,8 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />

        <!-- styles -->
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap.css' }) }}" />
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap-responsive.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
        <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />

        <!-- All JavaScript at the bottom, except this Modernizr build.
--- a/templates/web/api/auth/native_app_access_token.html.twig
+++ b/templates/web/api/auth/native_app_access_token.html.twig
@@ -15,8 +15,8 @@
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />

        <!-- styles -->
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap.css' }) }}" />
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap-responsive.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
        <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/oauth/default.css' }) }}" />

        <!-- All JavaScript at the bottom, except this Modernizr build.
--- a/templates/web/client/index.html.twig
+++ b/templates/web/client/index.html.twig
@@ -40,7 +40,7 @@
    <![endif]-->
        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'f=include/tinymce/jscripts/tiny_mce/tiny_mce.js' }) }}"></script>
-        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
        <script type="text/javascript" src="{{ path('minifier', { 'g' : 'client' }) }}"></script>
        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/flowplayer/flowplayer-3.2.11.min.js' }) }}"></script>

--- a/templates/web/common/index_bootstrap.html.twig
+++ b/templates/web/common/index_bootstrap.html.twig
@@ -4,8 +4,8 @@
        <meta http-equiv="X-UA-Compatible" content="chrome=1">
        <title>{% if local_title is defined%}{{local_title}} | {% endif %}{{ app['phraseanet.registry'].get('GV_homeTitle') }} {% if module_name is defined %} - {{ module_name }} {% endif %}</title>

-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap.css' }) }}" />
-        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap-responsive.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap.css' }) }}" />
+        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/build/bootstrap/css/bootstrap-responsive.css' }) }}" />
        <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/common/main.css' }) }}"/>

        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
--- a/templates/web/lightbox/IE6/feed.html.twig
+++ b/templates/web/lightbox/IE6/feed.html.twig
@@ -5,7 +5,7 @@

 {% block javascript %}
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
        <script type="text/javascript" src="{{ path('minifier', { 'g' : 'lightboxie6' }) }}"></script>
 {% endblock %}

--- a/templates/web/lightbox/IE6/index.html.twig
+++ b/templates/web/lightbox/IE6/index.html.twig
@@ -4,7 +4,7 @@

 {% block javascript %}
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
        <script type="text/javascript" src="{{ path('minifier', { 'g' : 'lightbox' }) }}"></script>
 {% endblock %}

--- a/templates/web/lightbox/IE6/validate.html.twig
+++ b/templates/web/lightbox/IE6/validate.html.twig
@@ -5,7 +5,7 @@

 {% block javascript %}
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
        <script type="text/javascript" src="{{ path('minifier', { 'g' : 'lightboxie6' }) }}"></script>
 {% endblock %}

--- a/templates/web/lightbox/feed.html.twig
+++ b/templates/web/lightbox/feed.html.twig
@@ -5,7 +5,7 @@

 {% block javascript %}
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
    <script type="text/javascript" src="{{ path('minifier', { 'g' : 'lightbox' }) }}"></script>
 {% endblock %}

--- a/templates/web/lightbox/index.html.twig
+++ b/templates/web/lightbox/index.html.twig
@@ -4,7 +4,7 @@

 {% block javascript %}
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
    <script type="text/javascript" src="{{ path('minifier', { 'g' : 'lightbox' }) }}"></script>
 {% endblock %}

--- a/templates/web/lightbox/validate.html.twig
+++ b/templates/web/lightbox/validate.html.twig
@@ -5,7 +5,7 @@

 {% block javascript %}
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
    <script type="text/javascript" src="{{ path('minifier', { 'g' : 'lightbox' }) }}"></script>
 {% endblock %}

--- a/templates/web/overview.html.twig
+++ b/templates/web/overview.html.twig
@@ -61,7 +61,7 @@
 {% endblock %}
 {% block javascript %}
        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery.mousewheel.js,include/jquery.image_enhancer.js,include/jslibs/swfobject/swfobject.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
        <script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.11.min.js"></script>
    <script type="text/javascript">
      $(document).ready(function(){
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -1016,7 +1016,7 @@
        {% include "prod/thesaurus.js" %}
    </script>
    <script type="text/javascript" src="{{ path('minifier', { 'g' : 'prod' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
    <script type="text/javascript">
        $(document).ready(function(){
            p4.reg_delete="{% if app['authentication'].getUser().getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}";
--- a/templates/web/report/all_content.html.twig
+++ b/templates/web/report/all_content.html.twig
@@ -39,7 +39,7 @@
    </script>
    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
    <script type="text/javascript" src="{{ path('minifier', { 'g' : 'report' }) }}"></script>
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery.gvChart-0.1.js' }) }}"></script>
    <script type="text/javascript">
--- a/templates/web/setup/wrapper.html.twig
+++ b/templates/web/setup/wrapper.html.twig
@@ -3,7 +3,7 @@
 <html lang="{{ locale }}">
  <head>
    <script src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery-validation/$.validate.js,include/jslibs/jquery-validate.password/$.validate.password.js,include/jslibs/$.cookie.js' }) }}" type="text/javascript"></script>
-    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
    <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/path_files_tests.jquery.js' }) }}"></script>
    <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css' }) }}" />
    <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/setup/setup.css' }) }}" />
--- a/templates/web/thesaurus/thesaurus.html.twig
+++ b/templates/web/thesaurus/thesaurus.html.twig
@@ -15,7 +15,7 @@

        <link rel="shortcut icon" type="image/x-icon" href="/skins/thesaurus/favicon.ico">
        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js' }) }}"></script>
-        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js' }) }}"></script>
+        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'include/jslibs/jquery-ui-1.8.24.js' }) }}"></script>
        <script type="text/javascript" src="{{ path('minifier', { 'g' : 'thesaurus' }) }}"></script>
        <script type="text/javascript">

--- a/www/include/js/tests/jquery.Upload.js.html
+++ b/www/include/js/tests/jquery.Upload.js.html
@@ -4,7 +4,7 @@
        <title></title>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
        <script src="../../../assets/jquery/jquery.js"></script>
-        <script src="../../jslibs/jquery-ui-1.8/js/jquery-ui-1.8.17.custom.min.js"></script>
+        <script src="../../jslibs/jquery-ui-1.8.24.js"></script>
        <script src="../../../assets/qunit/qunit/qunit.js"></script>
        <script src="../../../assets/blueimp-load-image/load-image.js"></script>
        <script src="../../../skins/prod/jquery.Upload.js"></script>
--- a/www/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js
+++ b/www/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js
--- a/www/include/jslibs/jquery-ui-1.8.24.js
+++ b/www/include/jslibs/jquery-ui-1.8.24.js
--- a/www/include/jslibs/jquery.vertical.buttonset.html
+++ b/www/include/jslibs/jquery.vertical.buttonset.html
@@ -1,7 +1,7 @@
 <meta charset="utf-8">

-<script type="text/javascript" src="jquery-1.7.1.min.js"></script>
-<script type="text/javascript" src="jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
+<script type="text/javascript" src="/assets/jquery/jquery.js"></script>
+<script type="text/javascript" src="jquery-ui-1.8.24.js"></script>
 <script type="text/javascript" src="jquery.vertical.buttonset.js"></script>
 <link media="all" type="text/css" href="jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" rel="stylesheet">

--- a/www/scripts/apps/admin/fields/main.js
+++ b/www/scripts/apps/admin/fields/main.js
@@ -11,8 +11,8 @@
 require.config({
    baseUrl: "/scripts",
    paths: {
-        jquery: "../include/jslibs/jquery-1.7.1",
-        jqueryui: "../include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min",
+        jquery: "../assets/jquery/jquery",
+        jqueryui: "../include/jslibs/jquery-ui-1.8.24",
        underscore: "../assets/underscore-amd/underscore",
        backbone: "../assets/backbone-amd/backbone",
        twig: "../assets/twig/twig",
--- a/www/scripts/tests/main.js
+++ b/www/scripts/tests/main.js
@@ -9,8 +9,8 @@ require.config({
        sinonMock: "../assets/sinon/lib/sinon/mock",
        sinonStub: "../assets/sinon/lib/sinon/stub",
        app: "apps/admin/fields/app",
-        jquery: "../include/jslibs/jquery-1.7.1",
-        jqueryui: "../include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min",
+        jquery: "../assets/jquery/jquery",
+        jqueryui: "../include/jslibs/jquery-ui-1.8.24",
        underscore: "../assets/underscore-amd/underscore",
        backbone: "../assets/backbone-amd/backbone",
        twig: "../assets/twig/twig",