Merge pull request #7 from mingliangfeng/issue-6

Issue 6
mingliangfeng · Jan 22, 2014 · 10f072a · 10f072a
2 parents 82938b6 + 256ae36
commit 10f072a
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 18 deletions.
diff --git a/dist/jquery.validate.bootstrap.popover.js b/dist/jquery.validate.bootstrap.popover.js
diff --git a/dist/jquery.validate.bootstrap.popover.min.js b/dist/jquery.validate.bootstrap.popover.min.js
diff --git a/jquery.validate.bootstrap.popover.coffee b/jquery.validate.bootstrap.popover.coffee
@@ -4,13 +4,15 @@ $ = jQuery
 # Adds plugin object to jQuery
 $.fn.extend validate_popover: (options) ->
   settings = $.extend true, {}, $.validator.popover_defaults, options
+  $.validator.get_offset_element = settings.get_offset_element if settings.get_offset_element
   this.validate(settings)
 
 $.extend $.validator,
   popover_defaults:
     onsubmit: true
     popoverPosition: 'right'
     popoverContainer: 'body'
+    hideForInvisible: true
     success: (error, element)-> $.validator.hide_validate_popover(element)
     errorPlacement: (error, element)->
       message = error.html()
@@ -32,9 +34,11 @@ $.extend $.validator,
     $('.popover-content', $v_popover).html(message)
     $.validator.reset_position $v_popover, element
     $v_popover.show() if message? and message != ''
+
+  get_offset_element: (element)-> $(element)  
 
   reset_position: (popover, element)->
-    offset = $(element).offset()
+    offset = $.validator.get_offset_element(element).offset()
     offset_adjust = $(element).data('popover-offset') || "0,0"
     [top_adjust, left_adjust] = offset_adjust.split(',')
 
@@ -47,7 +51,7 @@ $.extend $.validator,
       left = offset.left + $(element).width() + 20 + parseInt(left_adjust)
     popover.css({top: top, left: left})
 
-  get_position: (element) -> $(element).data('popover-position') || $.data($(element)[0].form, "validator").settings.popoverPosition
+  get_position: (element) -> $(element).data('popover-position') || $.validator.validator_settings(element).popoverPosition
 
   reposition: (elements)->
     if elements?
@@ -59,18 +63,27 @@ $.extend $.validator,
       ele = $(element)
       popover = ele.data('validate-popover')
       if popover? and popover.is(":visible")
-        if ele.is(":visible")
-          $.validator.reset_position popover, element
-        else
+        if $.validator.hide_popover_for_invisible(element) and !ele.is(":visible")
           popover.hide()
+        else
+          $.validator.reset_position popover, element
 
   get_validate_popover: (element)->
     v_popover = $(element).data('validate-popover')
     unless v_popover?
-      $container = $($.data($(element)[0].form, "validator").settings.popoverContainer)
+      $container = $($.validator.validator_settings(element).popoverContainer)
       v_popover = $("<div class='popover #{$.validator.get_position(element)} error-popover' id='validate-popover'><div class='arrow'></div><div class='popover-content'></div></div>").appendTo($container)
       v_popover.click -> $(this).hide()
       $(element).data('validate-popover', v_popover)
       $.validator.popover_elements_cached.push element
     v_popover.hide()
 
+  hide_popover_for_invisible: (element)->
+    element_setting = $(element).data('popover-hide-for-invisible')
+    if element_setting?
+      element_setting
+    else
+      $.validator.validator_settings(element).hideForInvisible
+
+  validator_settings: (element)-> $.data($(element)[0].form, "validator").settings
+