summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/chrome.js6
-rw-r--r--addons/web/static/src/js/data.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 153234e9891..9c9063f32c3 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -172,7 +172,7 @@ openerp.web.Loading = openerp.web.Widget.extend({
}
});
-openerp.web.Dataweb = openerp.web.Widget.extend({
+openerp.web.Database = openerp.web.Widget.extend({
init: function(parent, element_id, option_id) {
this._super(parent, element_id);
this.$option_id = $('#' + option_id);
@@ -499,7 +499,7 @@ openerp.web.Login = openerp.web.Widget.extend({
this, "oe_database", "oe_db_options");
this.$element.find('#oe-db-config').click(function() {
- self.dataweb.start();
+ self.database.start();
});
this.$element.find("form").submit(this.on_submit);
@@ -825,7 +825,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
this._super(null, element_id);
openerp.webclient = this;
- QWeb.add_template("/web/static/src/xml/web.xml");
+ QWeb.add_template("/web/static/src/xml/base.xml");
var params = {};
if(jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
this.$element.addClass("kitten-mode-activated");
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index d687cc3c310..c4b489242fa 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -365,7 +365,7 @@ openerp.web.DataSet = openerp.web.Widget.extend( /** @lends openerp.web.DataSet
}, callback, error_callback);
},
/**
- * Deletes an existing record from the dataweb
+ * Deletes an existing record from the database
*
* @param {Number|String} ids identifier of the record to delete
* @param {Function} callback function called with operation result