diff --git a/addons/point_of_sale/static/src/js/gui.js b/addons/point_of_sale/static/src/js/gui.js index cabe2ec1982..24e48732ede 100644 --- a/addons/point_of_sale/static/src/js/gui.js +++ b/addons/point_of_sale/static/src/js/gui.js @@ -8,7 +8,6 @@ odoo.define('point_of_sale.gui', function (require) { var core = require('web.core'); var Model = require('web.Model'); -var cordova = require('web.cordova'); var _t = core._t; @@ -27,7 +26,6 @@ var Gui = core.Class.extend({ this.current_screen = null; this.chrome.ready.then(function(){ - cordova.posready(); self.close_other_tabs(); var order = self.pos.get_order(); if (order) { @@ -335,7 +333,6 @@ var Gui = core.Class.extend({ this.chrome.loading_message(_t('Closing ...')); this.pos.push_order().then(function(){ - cordova.poslogout(); return new Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']) .pipe(function(res) { window.location = '/web#action=' + res[0]['res_id']; diff --git a/addons/web/static/src/js/framework/cordova.js b/addons/web/static/src/js/framework/cordova.js deleted file mode 100644 index 8eb22dd182d..00000000000 --- a/addons/web/static/src/js/framework/cordova.js +++ /dev/null @@ -1,83 +0,0 @@ -odoo.define('web.Cordova', function(require) { -"use strict"; - -var core = require('web.core'); - -// The Android/iPhone App is a JS/HTML app that launches the -// Odoo webclient in an iframe, using the Cordova framework. -// -// This class acts as a link between the webclient and the -// Odoo Android/iPhone App implemented with cordova. - -var Cordova = core.Class.extend({}, core.mixins.PropertiesMixin, { - init: function(parent) { - var self = this; - core.mixins.PropertiesMixin.init.call(this, parent); - - window.addEventListener('message', function(event) { - self.receive(event); - }, false); - - }, - // odoo.send('foobar') in cordova will call messages.foobar() - messages: { - // launch the POS ! - pos: function() { - if (window.location.href.indexOf('/pos/web') < 0) { - window.location.href = "/pos/web"; - } - }, - }, - // what happens when we receive an event from cordova - // -> call messages[event.data]() - // -> selfs trigger(event.data) - receive: function(event) { - if (event.origin !== 'file://') { - return; - } - - if (typeof event.data === 'string') { - this.trigger(event.data); - if (this.messages[event.data]) { - this.messages[event.data].call(this); - } - } - }, - // send a message to cordova - send: function(message) { - function inIframe(){ - try { - return window.self !== window.top; - } catch (e) { - return true; - } - } - if (inIframe()) { - window.parent.postMessage(message,'file://'); - } - }, - - - // notifies cordova that the webclient is ready. - ready: function() { this.send('ready'); }, - // notifies cordova that we want to exit the app. - logout: function() { this.send('logout'); }, - // notifies cordova that the point of sale is ready. - posready: function() { this.send('posready'); }, - // notifies cordova that we want to exit the point of sale. - poslogout: function() { this.send('poslogout'); }, - // asks cordova to emit a beep. - beep: function() { this.send('beep'); }, - // ask cordova to vibrate the phone. - vibrate: function() { this.send('vibrate'); }, -}); - -return Cordova; -}); - -// Singleton module -odoo.define('web.cordova', function(require) { -"use strict"; -var Cordova = require('web.Cordova'); -return new Cordova(); -}); diff --git a/addons/web/static/src/js/web_client.js b/addons/web/static/src/js/web_client.js index b326a4537fc..c6fd30d6c13 100644 --- a/addons/web/static/src/js/web_client.js +++ b/addons/web/static/src/js/web_client.js @@ -3,7 +3,6 @@ odoo.define('web.WebClient', function (require) { var ActionManager = require('web.ActionManager'); var core = require('web.core'); -var cordova = require('web.cordova'); var crash_manager = require('web.crash_manager'); var data = require('web.data'); var Loading = require('web.Loading'); @@ -62,10 +61,6 @@ var WebClient = Widget.extend({ delete(self.client_options.action); } core.bus.trigger('web_client_ready'); - cordova.ready(); - cordova.on('back', self, function() { - self.do_action('history_back'); - }); }); }, bind_events: function() { @@ -264,7 +259,6 @@ var WebClient = Widget.extend({ on_logout: function() { var self = this; if (!this.has_uncommitted_changes()) { - cordova.logout(); self.action_manager.do_action('logout'); } }, diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html index 5415fc07523..f96699e76f7 100644 --- a/addons/web/views/database_manager.html +++ b/addons/web/views/database_manager.html @@ -62,7 +62,6 @@ - diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 370b4796988..ce3054ab3a3 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -133,7 +133,6 @@ -