summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-07-02 18:23:07 +0200
committerFabien Meghazi <fme@openerp.com>2014-07-02 18:23:07 +0200
commit2fe3aff0818ee47d2ce3d6e7a875113e8dd7ecdf (patch)
treef132aacb4e35d65efbf0b75af3fb1ced8486da35
parentfdd3a78c6275ffa2b0a398c6c84f73e439e73bf7 (diff)
Move duplicate jQuery custom plugin in openerpframework
-rw-r--r--addons/stock/static/src/js/widgets.js5
-rw-r--r--addons/web/static/src/js/openerpframework.js7
-rw-r--r--addons/website_event_track/static/src/js/website_event_track.js6
3 files changed, 7 insertions, 11 deletions
diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js
index 80d3ba65ba3..c54505e3f2e 100644
--- a/addons/stock/static/src/js/widgets.js
+++ b/addons/stock/static/src/js/widgets.js
@@ -28,11 +28,6 @@ function openerp_picking_widgets(instance){
var self = this;
this.rows = [];
this.search_filter = "";
- jQuery.expr[":"].Contains = jQuery.expr.createPseudo(function(arg) {
- return function( elem ) {
- return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
- };
- });
},
get_header: function(){
return this.getParent().get_header();
diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js
index f190fefeba3..77be9fd6ba8 100644
--- a/addons/web/static/src/js/openerpframework.js
+++ b/addons/web/static/src/js/openerpframework.js
@@ -1517,6 +1517,13 @@ openerp.time_to_str = function(obj) {
+ lpad(obj.getSeconds(),2);
};
+// jQuery custom plugins
+jQuery.expr[":"].Contains = jQuery.expr.createPseudo(function(arg) {
+ return function( elem ) {
+ return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+ };
+});
+
openerp.declare = declare;
return openerp;
diff --git a/addons/website_event_track/static/src/js/website_event_track.js b/addons/website_event_track/static/src/js/website_event_track.js
index 8093b9e7bca..494d75bb9e0 100644
--- a/addons/website_event_track/static/src/js/website_event_track.js
+++ b/addons/website_event_track/static/src/js/website_event_track.js
@@ -1,11 +1,5 @@
$(document).ready(function() {
- jQuery.expr[":"].Contains = jQuery.expr.createPseudo(function(arg) {
- return function( elem ) {
- return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
- };
- });
-
$("#event_track_search").bind('keyup', function(e){
var change_text = $(this).val();
$('.event_track').removeClass('invisible');