Reorder files structure

Reorder files structure move multiview
This commit is contained in:
Nicolas Le Goff
2013-06-07 18:37:28 +02:00
parent d17d14bf46
commit 802f83d86d
4 changed files with 37 additions and 10 deletions

View File

@@ -15,14 +15,10 @@ require.config({
jqueryui: "../include/jslibs/jquery-ui-1.8.24",
underscore: "../assets/underscore-amd/underscore",
backbone: "../assets/backbone-amd/backbone",
twig: "../assets/twig/twig",
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
bootstrap: "../skins/build/bootstrap/js/bootstrap.min"
},
shim: {
twig: {
exports: "Twig"
},
bootstrap : ["jquery"],
jqueryui: {
deps: [ "jquery" ]

View File

@@ -12,14 +12,14 @@ define([
"underscore",
"backbone",
"i18n",
"apps/admin/fields/views",
"common/multiviews",
"apps/admin/fields/views/alert",
"apps/admin/fields/views/modal",
"apps/admin/fields/views/dcField",
"apps/admin/fields/errors/error"
], function($, _, Backbone, i18n, ViewUtils, AlertView, ModalView, DcFieldView, Error) {
], function($, _, Backbone, i18n, MultiViews, AlertView, ModalView, DcFieldView, Error) {
// Add multiview methods
var FieldEditView = Backbone.View.extend(_.extend({}, ViewUtils.MultiViews, {
var FieldEditView = Backbone.View.extend(_.extend({}, MultiViews, {
tagName: "div",
className: "field-edit",
initialize: function() {

View File

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

View File

@@ -0,0 +1,31 @@
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
define([
"jquery",
"underscore",
"backbone"
], function($, _, Backbone) {
return {
// bind a subview to a DOM element
"_assignView": function(selector, view) {
var selectors;
if (_.isObject(selector)) {
selectors = selector;
} else {
selectors = {};
selectors[selector] = view;
}
if (!selectors) return;
_.each(selectors, function(view, selector) {
view.setElement(this.$(selector)).render();
}, this);
}
};
});