Fix tests

This commit is contained in:
Nicolas Le Goff
2014-02-28 18:13:31 +01:00
parent 2e40205bc3
commit cf2105865b
18 changed files with 540 additions and 184 deletions

View File

@@ -9,14 +9,14 @@
define([
"jquery",
"jqueryui",
"underscore",
"backbone",
"i18n",
"common/multiviews",
"apps/admin/fields/views/listRow",
"apps/admin/fields/views/create"
], function ($, jqueryui, _, Backbone, i18n, MultiViews, FieldListRowView, CreateView) {
"apps/admin/fields/views/create",
"jquery.ui"
], function ($, _, Backbone, i18n, MultiViews, FieldListRowView, CreateView) {
var FieldListView = Backbone.View.extend(_.extend({}, MultiViews, {
events: {
"keyup #live_search": "searchAction",

View File

@@ -51,4 +51,4 @@ require.config({
deps: ["jquery.ui.widget"]
}
}
});
});

View File

@@ -12,7 +12,7 @@ require.config({
baseUrl: "/scripts",
paths: {
jquery: "../assets/jquery/jquery",
jqueryui: "../assets/jquery.ui/jquery-ui",
"jquery.ui": "../assets/jquery.ui/jquery-ui",
underscore: "../assets/underscore-amd/underscore",
backbone: "../assets/backbone-amd/backbone",
i18n: "../assets/i18next/i18next.amd-1.6.3",
@@ -22,12 +22,12 @@ require.config({
},
shim: {
bootstrap: ["jquery"],
jqueryui: {
"jquery.ui": {
deps: ["jquery"]
},
"jquery.geonames": {
deps: ['jquery', 'jqueryui'],
exports: '$.fn.geocompleter'
deps: ["jquery", "jquery.ui"],
exports: "$.fn.geocompleter"
},
"common/geonames": {
deps: ["jquery.geonames"]