diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-03-01 12:26:27 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-03-01 12:26:27 +0100 |
| commit | e87a05f9a945cdaffc47f1b6f0dad430d3f5d422 (patch) | |
| tree | 0cd045b2e91335b1376b0c6fd638eee14f573957 /addons | |
| parent | 4a6776d7a11f6c2004358c614411bd662dca2ad6 (diff) | |
[FIX] mobile client breakage from a bunch of changes only set in the main client
Culprit commits:
* fme@openerp.com-20120214105145-pat0srumt8m7nq38 (update of jquery-ui timepicker, move of its files)
* xmo@openerp.com-20120227073721-nkgeiqacbzch8xev (update & rename of py.parse to py.js)
* nicolas.vanhoren@openerp.com-20120229111140-ta8fwqzdjwm2br88 (extract stuff to un-linked library, rename methods)
lp bug: https://launchpad.net/bugs/943697 fixed
bzr revid: xmo@openerp.com-20120301112627-24ipmxfosd9xin8o
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/web_mobile/static/src/js/chrome_mobile.js | 2 | ||||
| -rwxr-xr-x | addons/web_mobile/static/src/web_mobile.html | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index bcfedd49dba..a28956a0cab 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -23,7 +23,7 @@ openerp.web_mobile.MobileWebClient = openerp.web.OldWidget.extend({ start: function() { this._super.apply(this, arguments); var self = this; - this.session.bind().then(function() { + this.session.bind_session().then(function() { openerp.web.qweb.add_template("xml/web_mobile.xml"); self.$element.html(self.render()); self.login.start(); diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html index 391b6c2be7b..5e811f99b48 100755 --- a/addons/web_mobile/static/src/web_mobile.html +++ b/addons/web_mobile/static/src/web_mobile.html @@ -13,7 +13,7 @@ <script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.string.js"></script>
- <script type="text/javascript" src="/web/static/lib/py.parse/lib/py.js"></script>
+ <script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script>
<script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script>
<script type="text/javascript" src="/web/static/lib/datejs/globalization/en-US.js"></script>
@@ -22,9 +22,10 @@ <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
<script type="text/javascript" src="/web/static/lib/datejs/sugarpak.js"></script>
<script type="text/javascript" src="/web/static/lib/datejs/time.js"></script>
- <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js"></script>
+ <script type="text/javascript" src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js"></script>
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
+ <script type="text/javascript" src="/web/static/lib/novajs/src/nova.js"></script>
<script type="text/javascript" src="/web/static/src/js/boot.js"></script>
<script type="text/javascript" src="/web/static/src/js/core.js"></script>
<script type="text/javascript" src="/web/static/src/js/dates.js"></script>
|