pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Switch to QWeb2

Browse Source 
bzr revid: fme@openerp.com-20110504114234-h8pmdk6sev7ni7wt
This commit is contained in:
Fabien Meghazi
2011-05-04 13:42:34 +02:00
parent 2ec97d011b
commit d45786c01b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/lib/qweb/qweb-test.js.html
+1
View File
@@ -8,6 +8,7 @@
<script type="text/javascript" src="qweb2.js"></script>
<script>
QWeb = new QWeb2.Engine();
function trim(s) {
return s.replace(/(^\s+|\s+$)/g, '');
}
addons/base/static/lib/qweb/qweb2.js
-2
View File
@@ -560,5 +560,3 @@ QWeb2.Element = (function() {
});
return Element;
})();
QWeb = new QWeb2.Engine();
addons/base/static/src/base.html
+4
View File
@@ -8,7 +8,10 @@
<script type="text/javascript" src="/base/static/lib/LABjs/LAB.js"></script>
<script type="text/javascript" src="/base/static/lib/underscore/underscore.js"></script>
<script type="text/javascript" src="/base/static/lib/underscore/underscore.strings.js"></script>
<script type="text/javascript" src="/base/static/lib/qweb/qweb2.js"></script>
<!-- Uncomment in order to use legacy QWeb
<script type="text/javascript" src="/base/static/lib/qweb/qweb.js"></script>
-->
<script type="text/javascript" src="/base/static/lib/jquery/jquery-1.5.2.js"></script>
<script type="text/javascript" src="/base/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
<script type="text/javascript" src="/base/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js"></script>
@@ -34,6 +37,7 @@
<script type="text/javascript">
$(function() {
QWeb = window.QWeb || new QWeb2.Engine();
var oe = openerp.init();
oe.base.webclient("oe");
});