PartPicker: nicht global cachen sondern mit $.data ans DOM objekt packen

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index b9ef3e92476cd7f0cb60d1db8ebb62f6eb90bcba..339801bb1206456705e0754eedc702d746685e6b 100644 (file)
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -1,6 +1,9 @@
 namespace('kivi', function(k){
 namespace('kivi', function(k){

-  k.PartPickerCache = { }

   k.PartPicker = function($real, options) {
   k.PartPicker = function($real, options) {

+    // short circuit in case someone double inits us
+    if ($real.data("part_picker"))
+      return $real.data("part_picker");
+

     var o = $.extend({
       limit: 20,
       delay: 50,
     var o = $.extend({
       limit: 20,
       delay: 50,


@@ -151,7 +154,7 @@ namespace('kivi', function(k){
     pcont.append(picker);
     picker.addClass('icon16 CRM--Schnellsuche').click(open_dialog);
 
     pcont.append(picker);
     picker.addClass('icon16 CRM--Schnellsuche').click(open_dialog);
 

-    return {
+    var pp = {

       real:           function() { return $real },
       dummy:          function() { return $dummy },
       type:           function() { return $type },
       real:           function() { return $real },
       dummy:          function() { return $dummy },
       type:           function() { return $type },


@@ -180,11 +183,13 @@ namespace('kivi', function(k){
         });
       }
     }
         });
       }
     }

+    $real.data('part_picker', pp);
+    return pp;

   }
 });
 
 $(function(){
   $('input.part_autocomplete').each(function(i,real){
   }
 });
 
 $(function(){
   $('input.part_autocomplete').each(function(i,real){

-    kivi.PartPickerCache[real.id] = new kivi.PartPicker($(real));
+    kivi.PartPicker($(real));

   })
 });
   })
 });

diff --git a/templates/webpages/part/_part_picker_result.html b/templates/webpages/part/_part_picker_result.html
index 0512b49ad8b14f34dfb9c1a5f2d2a735e8e478bd..6b848f3b49a379fed9aee64990bb02a3e14e2b0e 100644 (file)
--- a/templates/webpages/part/_part_picker_result.html
+++ b/templates/webpages/part/_part_picker_result.html
@@ -26,6 +26,5 @@
 [% L.paginate_controls(target='#part_picker_result', selector='#part_picker_result') %]
 
 <script type='text/javascript'>
 [% L.paginate_controls(target='#part_picker_result', selector='#part_picker_result') %]
 
 <script type='text/javascript'>

-  var pp = kivi.PartPickerCache[$('#part_picker_real_id').val()];
-  pp.init_results();
+  kivi.PartPicker($('#'+$('#part_picker_real_id').val())).init_results()

 </script>
 </script>

diff --git a/templates/webpages/part/part_picker_search.html b/templates/webpages/part/part_picker_search.html
index 69dca1b117b64fb6c2abc0ebeac6ccc70e406f48..a3cf406182b1cc48ccd5624a5811872e08c3ffdc 100644 (file)
--- a/templates/webpages/part/part_picker_search.html
+++ b/templates/webpages/part/part_picker_search.html
@@ -15,7 +15,7 @@
 
 <script type='text/javascript'>
   var timer;
 
 <script type='text/javascript'>
   var timer;

-  var pp = kivi.PartPickerCache['[% FORM.real_id %]'];
+  var pp = kivi.PartPicker($('#[% FORM.real_id %]'));

   $(function(){
     $('#part_picker_filter').focus();
     pp.update_results();
   $(function(){
     $('#part_picker_filter').focus();
     pp.update_results();