diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-01-24 15:58:10 +0100 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2012-01-24 15:58:10 +0100 |
| commit | 3002bd091fd4a0380c88b907e217b6828d96d2b1 (patch) | |
| tree | 5cdd9594c5f39914be83297ad3eb7a02da60d057 /addons/web/static/src/js | |
| parent | b1fc7cc4a2cdeb5d6875878d7896496a2f54a4ff (diff) | |
[imp] removed bunch of old stuff in widget
bzr revid: nicolas.vanhoren@openerp.com-20120124145810-lr2y8igt9iqzqepn
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 32 | ||||
| -rw-r--r-- | addons/web/static/src/js/core.js | 35 | ||||
| -rw-r--r-- | addons/web/static/src/js/data.js | 10 | ||||
| -rw-r--r-- | addons/web/static/src/js/search.js | 16 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_editor.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 8 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_help.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 10 |
8 files changed, 51 insertions, 66 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 05f52dd36d2..f9e5ba327be 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -5,7 +5,7 @@ openerp.web.chrome = function(openerp) { var QWeb = openerp.web.qweb, _t = openerp.web._t; -openerp.web.Notification = openerp.web.Widget.extend(/** @lends openerp.web.Notification# */{ +openerp.web.Notification = openerp.web.OldWidget.extend(/** @lends openerp.web.Notification# */{ template: 'Notification', identifier_prefix: 'notification-', @@ -36,12 +36,12 @@ openerp.web.Notification = openerp.web.Widget.extend(/** @lends openerp.web.Not }); -openerp.web.Dialog = openerp.web.Widget.extend(/** @lends openerp.web.Dialog# */{ +openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{ dialog_title: "", identifier_prefix: 'dialog', /** * @constructs openerp.web.Dialog - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param options @@ -208,11 +208,11 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ } }); -openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# */{ +openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loading# */{ template: 'Loading', /** * @constructs openerp.web.Loading - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -267,11 +267,11 @@ openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# } }); -openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database# */{ +openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Database# */{ template: "DatabaseManager", /** * @constructs openerp.web.Database - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -551,14 +551,14 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database } }); -openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ +openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# */{ remember_credentials: true, template: "Login", identifier_prefix: 'oe-app-login-', /** * @constructs openerp.web.Login - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -649,12 +649,12 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ } }); -openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# */{ +openerp.web.Header = openerp.web.OldWidget.extend(/** @lends openerp.web.Header# */{ template: "Header", identifier_prefix: 'oe-app-header-', /** * @constructs openerp.web.Header - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent */ @@ -830,10 +830,10 @@ openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# * } }); -openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ +openerp.web.Menu = openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */{ /** * @constructs openerp.web.Menu - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -1045,10 +1045,10 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ } }); -openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{ +openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebClient */{ /** * @constructs openerp.web.WebClient - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param element_id */ @@ -1183,7 +1183,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie } }); -openerp.web.EmbeddedClient = openerp.web.Widget.extend({ +openerp.web.EmbeddedClient = openerp.web.OldWidget.extend({ template: 'EmptyComponent', init: function(action_id, options) { this._super(); diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 43bd8a0abf7..8bc9cca32b9 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -933,13 +933,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W */ template: null, /** - * The prefix used to generate an id automatically. Should be redefined in - * subclasses. If it is not defined, a generic identifier will be used. - * - * @type string - */ - identifier_prefix: 'generic-identifier-', - /** * Tag name when creating a default $element. * @type string */ @@ -958,15 +951,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W * with the DOM insertion methods provided by the current implementation of Widget. So * for new components this argument should not be provided any more. */ - init: function(parent, /** @deprecated */ element_id) { + init: function(parent) { this._super(); this.session = openerp.connection; - // if given an element_id, try to get the associated DOM element and save - // a reference in this.$element. Else just generate a unique identifier. - this.element_id = element_id; - this.element_id = this.element_id || _.uniqueId(this.identifier_prefix); - var tmp = document.getElementById(this.element_id); - this.$element = tmp ? $(tmp) : $(document.createElement(this.tag_name)); this.widget_parent = parent; this.widget_children = []; @@ -1128,17 +1115,15 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W } }); -/** - * @class - * @extends openerp.web.Widget - * @deprecated - * For retro compatibility only, the only difference with is that render() uses - * directly ``this`` instead of context with a ``widget`` key. - */ -openerp.web.OldWidget = openerp.web.Widget.extend(/** @lends openerp.web.OldWidget# */{ - render: function (additional) { - return openerp.web.qweb.render(this.template, _.extend(_.extend({}, this), additional || {})); - } +openerp.web.OldWidget = openerp.web.Widget.extend({ + identifier_prefix: 'generic-identifier-', + init: function(parent, /** @deprecated */ element_id) { + this._super(parent); + this.element_id = element_id; + this.element_id = this.element_id || _.uniqueId(this.identifier_prefix); + var tmp = document.getElementById(this.element_id); + this.$element = tmp ? $(tmp) : $(document.createElement(this.tag_name)); + }, }); openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.web.TranslationDataBase# */{ diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index a4d9e9e4d71..13653a83c2b 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -18,7 +18,7 @@ openerp.web.serialize_sort = function (criterion) { }).join(', '); }; -openerp.web.DataGroup = openerp.web.Widget.extend( /** @lends openerp.web.DataGroup# */{ +openerp.web.DataGroup = openerp.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{ /** * Management interface between views and grouped collections of OpenERP * records. @@ -30,9 +30,9 @@ openerp.web.DataGroup = openerp.web.Widget.extend( /** @lends openerp.web.DataG * content of the current grouping level. * * @constructs openerp.web.DataGroup - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * - * @param {openerp.web.Widget} parent widget + * @param {openerp.web.OldWidget} parent widget * @param {String} model name of the model managed by this DataGroup * @param {Array} domain search domain for this DataGroup * @param {Object} context context of the DataGroup's searches @@ -233,14 +233,14 @@ openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends } }); -openerp.web.DataSet = openerp.web.Widget.extend( /** @lends openerp.web.DataSet# */{ +openerp.web.DataSet = openerp.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{ identifier_prefix: "dataset", /** * DateaManagement interface between views and the collection of selected * OpenERP records (represents the view's state?) * * @constructs openerp.web.DataSet - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param {String} model the OpenERP model this dataset will manage */ diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 1a926cb0f05..99a6b2f4b01 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -3,11 +3,11 @@ var QWeb = openerp.web.qweb, _t = openerp.web._t, _lt = openerp.web._lt; -openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.SearchView# */{ +openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.SearchView# */{ template: "EmptyComponent", /** * @constructs openerp.web.SearchView - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param element_id @@ -499,13 +499,13 @@ openerp.web.search.Invalid = openerp.web.Class.extend( /** @lends openerp.web.se ); } }); -openerp.web.search.Widget = openerp.web.Widget.extend( /** @lends openerp.web.search.Widget# */{ +openerp.web.search.Widget = openerp.web.OldWidget.extend( /** @lends openerp.web.search.Widget# */{ template: null, /** * Root class of all search widgets * * @constructs openerp.web.search.Widget - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param view the ancestor view of this widget */ @@ -1105,7 +1105,7 @@ openerp.web.search.ExtendedSearch = openerp.web.search.Widget.extend({ } }); -openerp.web.search.ExtendedSearchGroup = openerp.web.Widget.extend({ +openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({ template: 'SearchView.extended_search.group', identifier_prefix: 'extended-search-group', init: function (parent, fields) { @@ -1150,12 +1150,12 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.Widget.extend({ } }); -openerp.web.search.ExtendedSearchProposition = openerp.web.Widget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{ +openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{ template: 'SearchView.extended_search.proposition', identifier_prefix: 'extended-search-proposition', /** * @constructs openerp.web.search.ExtendedSearchProposition - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param parent * @param fields @@ -1246,7 +1246,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.Widget.extend(/** @le } }); -openerp.web.search.ExtendedSearchProposition.Field = openerp.web.Widget.extend({ +openerp.web.search.ExtendedSearchProposition.Field = openerp.web.OldWidget.extend({ start: function () { this.$element = $("#" + this.element_id); } diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 6ae15a5fdb8..f506d63a677 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -1,7 +1,7 @@ openerp.web.view_editor = function(openerp) { var _t = openerp.web._t; var QWeb = openerp.web.qweb; -openerp.web.ViewEditor = openerp.web.Widget.extend({ +openerp.web.ViewEditor = openerp.web.OldWidget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); this.element_id = element_id diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 9e4b2738e1f..6eb7f13981d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -620,7 +620,7 @@ openerp.web.FormDialog = openerp.web.Dialog.extend({ /** @namespace */ openerp.web.form = {}; -openerp.web.form.SidebarAttachments = openerp.web.Widget.extend({ +openerp.web.form.SidebarAttachments = openerp.web.OldWidget.extend({ init: function(parent, form_view) { var $section = parent.add_section(_t('Attachments'), 'attachments'); this.$div = $('<div class="oe-sidebar-attachments"></div>'); @@ -737,12 +737,12 @@ openerp.web.form.compute_domain = function(expr, fields) { return _.all(stack, _.identity); }; -openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form.Widget# */{ +openerp.web.form.Widget = openerp.web.OldWidget.extend(/** @lends openerp.web.form.Widget# */{ template: 'Widget', identifier_prefix: 'formview-widget-', /** * @constructs openerp.web.form.Widget - * @extends openerp.web.Widget + * @extends openerp.web.OldWidget * * @param view * @param node @@ -1388,7 +1388,7 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({ } }); -openerp.web.DateTimeWidget = openerp.web.Widget.extend({ +openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({ template: "web.datetimepicker", jqueryui_object: 'datetimepicker', type_of_date: "datetime", diff --git a/addons/web/static/src/js/view_help.js b/addons/web/static/src/js/view_help.js index f7e5f7c259e..6f590c359d1 100644 --- a/addons/web/static/src/js/view_help.js +++ b/addons/web/static/src/js/view_help.js @@ -4,10 +4,10 @@ openerp.web.view_help = function(openerp) { -openerp.web.ProcessView = openerp.web.Widget.extend({ +openerp.web.ProcessView = openerp.web.OldWidget.extend({ }); -openerp.web.HelpView = openerp.web.Widget.extend({ +openerp.web.HelpView = openerp.web.OldWidget.extend({ }); }; diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index cf337d4647f..163807d7a4c 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -16,7 +16,7 @@ session.web.client_actions = new session.web.Registry(); */ session.web.views = new session.web.Registry(); -session.web.ActionManager = session.web.Widget.extend({ +session.web.ActionManager = session.web.OldWidget.extend({ identifier_prefix: "actionmanager", init: function(parent) { this._super(parent); @@ -208,12 +208,12 @@ session.web.ActionManager = session.web.Widget.extend({ } }); -session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.ViewManager# */{ +session.web.ViewManager = session.web.OldWidget.extend(/** @lends session.web.ViewManager# */{ identifier_prefix: "viewmanager", template: "ViewManager", /** * @constructs session.web.ViewManager - * @extends session.web.Widget + * @extends session.web.OldWidget * * @param parent * @param dataset @@ -765,7 +765,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner } }); -session.web.Sidebar = session.web.Widget.extend({ +session.web.Sidebar = session.web.OldWidget.extend({ init: function(parent, element_id) { this._super(parent, element_id); this.items = {}; @@ -1042,7 +1042,7 @@ session.web.TranslateDialog = session.web.Dialog.extend({ } }); -session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ +session.web.View = session.web.OldWidget.extend(/** @lends session.web.View# */{ template: "EmptyComponent", // name displayed in view switchers display_name: '', |
