jqajax_core2 0.0.9 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c33f2459d45b3e3b72d1733224c92a3b27029a1b
-  data.tar.gz: 7f00bf6b9b0aa00d5507064ff1a68c2c00a5b2a4
+  metadata.gz: c85b0bac54c45a89c23afdf274c4a394f7166fa3
+  data.tar.gz: 06ad4ba0ebf8913372cde586075f302b98c54b92
 SHA512:
-  metadata.gz: '09d2abfff9674248ed7e375df4a817e293f0301e0d2a00188faa7f6e942a2c4ba034575317cbbbd8d5eb771d8208c4e8a8c931b82a0de348c3036e91af64748a'
-  data.tar.gz: d9dcb7f5e0777cb17da6715daf94018a25e46c660aaa6412cd19c9a8f3c7b28f6584d56ff2bf5db2370e12f13a9393989b91d76f45839faa7c822d1dc8850a59
+  metadata.gz: 578e43be907c9039b8f604f76156f5c915cc848fec44250d87a8b971074662bae1b1eb8f1752bbd5128f120ca5573a00b822880c24a2d955f2426b136ac619f6
+  data.tar.gz: 23b469eb66a26d5f1c1c279839c8015d0e508153ad9fc94c744ccf7db52282184b20b1d8bb8dd8842f640dececed91ffc4a6b768a3e022218ef2667e6953fa5d

data/app/assets/javascripts/jqac2/helpers.js.coffee.erb

@@ -1,31 +1,27 @@
-window.JqAjaxCore2= {} if typeof(window.JqAjaxCore2) is 'undefined'
 window.JqAjaxCore2.Helpers =
 
 linkOptionsFromElement: (item) =>
   # Item is passed as $() object
   item = $(item)
   link_options = {};
-
+  
   link_options['target_div']        =   item.attr('<%= JqajaxCore2::Config.core[:update_div] %>')       || '<%= JqajaxCore2::Config.core[:ajax_content_container_id] %>'
   link_options['load_message']      =   item.attr('<%= JqajaxCore2::Config.loading[:load_message] %>')  || ''
   link_options['submit_data']       =   item.attr('<%= JqajaxCore2::Config.html_data[:submit_data] %>') || ''
   link_options['callback']          =   item.attr('<%= JqajaxCore2::Config.html_data[:callback] %>')    || ''
   link_options['append']            =   item.attr('<%= JqajaxCore2::Config.html_data[:append] %>') ? true : false
-
-  # Checking for confirmation
+  
+  # Checking for confirmation 
   link_options['confirm_message']   =   (item.attr('<%= JqajaxCore2::Config.html_data[:confirm] %>')  || '')
   link_options['confirm']           =   link_options['confirm_message'] != ''
-
+  
   return link_options
-
+  
 
 # Element ausblenden - verwendung als Callback nach löschen etc...
 hideItem: (id) ->
   $("#"+id).fadeOut(300);
 
-assignTooltipDimensions: (el) ->
-  $(el).css({display: 'none', opacity: 0})
-  $(el).css({ height: $(el).height()+'px' })
 
 
 # Element löschen - verwendung als Callback nach löschen etc...

data/app/assets/javascripts/jqac2/loading.js.coffee.erb

@@ -1,4 +1,3 @@
-window.JqAjaxCore2= {} if typeof(window.JqAjaxCore2) is 'undefined' 
 window.JqAjaxCore2.Loading =
   <% actionview = ActionView::Base.new %>
   <% actionview.view_paths += [File.expand_path("../../../../views", __FILE__)] %>
@@ -22,6 +21,7 @@ window.JqAjaxCore2.Loading =
       @overlay().fadeIn(200);
     <% end %>
 
+    
   hideLoading: ->
     @overlay().fadeOut(200);
   
@@ -36,16 +36,21 @@ window.JqAjaxCore2.Loading =
   # Flash Notify Tools
   flashNoticeDisplay: (text, mode) ->
     
+    
     mode = mode || 'ok'
     text = text.replace(/\'/g, "\"")
     html_notice = "<div class='jqac2-notify " + mode + "' style='display:none'>" + text + "</div>"
     
+    
+    
     @flashArea().html(html_notice)
     @flashArea().children().slideDown(500)
-    window.setTimeout('JqAjaxCore2.Loading.flashFadeOut()', <%= JqajaxCore2::Config.loading[:notify_display_duration] %>)
+    window.setTimeout('JqAjaxCore2.Loading.flashFadeOut()', 5000)
+    
 
   flashFadeOut: ->
     @flashArea().children().fadeOut(500)
+  
 
   loadAjaxFlashNotice: ->
   	$.getJSON '/jqca2/jqac2_flash', (data) ->
@@ -55,4 +60,6 @@ window.JqAjaxCore2.Loading =
   addLoader: (div, text) ->
     $('#'+div).html(JqAjaxCore2.Loading.loaderHtml.replace('{TXT}', text))
   
-  loaderHtml: '<%= actionview.render "/jqajax/loader" %>'
+  loaderHtml: '<%= actionview.render "/jqajax/loader" %>'
+
+

data/app/assets/javascripts/jqac2/modal.js.coffee.erb

@@ -1,4 +1,3 @@
-window.JqAjaxCore2= {} if typeof(window.JqAjaxCore2) is 'undefined' 
 window.JqAjaxCore2.Modal = 
   
   # Init position of overlay Modal

data/app/assets/javascripts/jqac2/validation.js.coffee.erb

@@ -1,4 +1,3 @@
-window.JqAjaxCore2= {} if typeof(window.JqAjaxCore2) is 'undefined'
 window.JqAjaxCore2.Validation =
 
 <% JqajaxCore2::Validations.settings.each do |name, settings|  %>
@@ -9,8 +8,8 @@ window.JqAjaxCore2.Validation =
     result.status = JqAjaxCore2.Validation.validateFormat(attr, <%= settings[:regexp] %>, <%= settings[:empty] == false ? 'false' : 'true' %>)
     result.message = JqAjaxCore2.ValidationErrorMessages.<%= name.to_s.camelize %>
     return result
-  <% end %>
-  # Provide getter for data attributes defined in th
+  <% end %>  
+  # Provide getter for data attributes defined in th 
   <% if settings[:data] %>
   get<%= name.to_s.camelize %>Data: (el) ->
     data = {}
@@ -18,91 +17,86 @@ window.JqAjaxCore2.Validation =
     data.<%= m.to_s.camelize %> = $(el).attr("<%= "data-#{JqajaxCore2::Validations.data_prefix}-#{m.to_s.dasherize}" %>") || "<%= d %>"
     <% end %>
     return data
-  <% end %>
+  <% end %>    
 <% end %>
-
-
+  
+  
   # Define Custom methods for complex validation
   validatePasswordSimple: (el) ->
     value = $(el).val()
-
+    
     settings = JqAjaxCore2.Validation.getPasswordSimpleData(el)
     result = {}
-
-    if value == ""
-      result.status  = true
-      return result
-    else
-      result.status  = false
-      result.message = JqAjaxCore2.Validation.renderErrorMessage(JqAjaxCore2.ValidationErrorMessages.PasswordSimple, settings)
-
-      if JqAjaxCore2.Validation.validateRequired(el) && value.length >= parseInt(settings.Length)
-        result.status = true
-        result.status = false if value.match(/[A-Za-z]/) == null
-        result.status = false if value.match(/[0-9]/) == null
-      return result
-
+    result.status  = false
+    result.message = JqAjaxCore2.Validation.renderErrorMessage(JqAjaxCore2.ValidationErrorMessages.PasswordSimple, settings)
+    
+    if JqAjaxCore2.Validation.validateRequired(el) && value.length >= parseInt(settings.Length)
+      result.status = true
+      result.status = false if value.match(/[A-Za-z]/) == null
+      result.status = false if value.match(/[0-9]/) == null
+    return result
+  
   validateConfirmation: (el) ->
     value = $(el).val()
-
+    
     settings = JqAjaxCore2.Validation.getConfirmationData(el)
     result = {}
     result.status  = false
     result.message = JqAjaxCore2.Validation.renderErrorMessage(JqAjaxCore2.ValidationErrorMessages.Confirmation, settings)
-
+    
     ref_value = $("#"+settings.ConfirmField).val()
-
-    if JqAjaxCore2.Validation.validateRequired(el) && value == ref_value
+    
+    if JqAjaxCore2.Validation.validateRequired(el) && value == ref_value 
       result.status = true
     return result
-
+  
   validateExact: (el) ->
     value = $(el).val()
-
+    
     settings = JqAjaxCore2.Validation.getExactData(el)
     result = {}
     result.status  = false
     result.message = JqAjaxCore2.Validation.renderErrorMessage(JqAjaxCore2.ValidationErrorMessages.Exact, settings)
-
+    
     if value == settings.Value
       result.status = true
-
-    return result
-
+      
+    return result 
+  
   validateLength: (el) ->
     value = $(el).val()
 
     settings = JqAjaxCore2.Validation.getLengthData(el)
     result = {}
     result.status  = false
-
+    
     result.message = JqAjaxCore2.Validation.renderErrorMessage(JqAjaxCore2.ValidationErrorMessages.Length, settings)
-    length_settings = JqAjaxCore2.Validation.getLengthData(el).Length
-
-    length_range = length_settings.split("-")
-
-    if length_range.length == 1
-      if value.length == parseInt(length_range[0])
-        result.status = true
-    else
-      if value.length >= parseInt(length_range[0]) && value.length <= parseInt(length_range[1])
-        result.status = true
 
+    if value.length == parseInt(JqAjaxCore2.Validation.getLengthData(el).Length)
+      result.status = true
+      
     return result
-
-  validateFromService: (el) ->
+  
+  validateFromService: (el) ->         
     value = $(el).val()
 
     json_url  = JqAjaxCore2.Validation.getFromServiceData(el).Url
     result = {}
     values_hash = {value: value}
-
+    
     # loading additional fields
     additional_fields = JSON.parse(JqAjaxCore2.Validation.getFromServiceData(el).AdditionalValues)
-
+    
     for id, name of additional_fields
       values_hash[name] = $("#"+id).val()
-
+    
+    
+    
+    console.log(el)
+    console.log(values_hash)
+    console.log(json_url)
+    
+    
     request = $.ajax
       dataType: "json",
       method: 'POST',
@@ -111,17 +105,17 @@ window.JqAjaxCore2.Validation =
       async: false
       success: (data) ->
         result = data
-
+    
     console.log(request)
-
+    
     return result
-
+    
   renderErrorMessage: (text, vars) ->
     t = text
     for attr, value of vars
       t = t.replace('['+attr+']', value)
-    return t
-
+    return t   
+  
   # Helper method for string validation with given regular expression
   validateFormat: (string, regexp, empty) ->
     if (!string || 0 == string.length) && empty == true
@@ -130,115 +124,77 @@ window.JqAjaxCore2.Validation =
       return false
     else
       return true
-
+  
   # run the complete validation for the given form
   validateForm: (form) ->
     form = $(form)
-
-    # check if there are any fields with errors
+      
+    # check if there are any fields with errors  
     formStatus = true
-    submitButton = $(form.find("input[type=submit]"))
-
+    submitButton = $(form.find("input[type=submit]")) 
+      
     $(".error-description").remove()
-    console.log
-    JqAjaxCore2.Validation.removeErrorFromInput(form.find(":input.error"))
-
+  
     $(form.find("input")).bind 'change keydown click', ->
       submitButton.removeAttr("disabled")
       submitButton.removeClass("disabled")
-
+  
     <% JqajaxCore2::Validations.settings.keys.each do |mode| %>
-    inputsForValidation = form.find(":input.<%= JqajaxCore2::Validations.settings[mode][:class] %>").not("[type='hidden']")
+    inputsForValidation = form.find(":input.<%= JqajaxCore2::Validations.settings[mode][:class] %>")
     inputsForValidation.each ->
-      if !$(this).is(":disabled")
-        validationResult = JqAjaxCore2.Validation.validate<%= mode.to_s.camelize %>($(this))
-        if validationResult.status == false && !$(this).hasClass("<%= JqajaxCore2::Validations.skip_validation_class %>") && $(this).parents(".<%= JqajaxCore2::Validations.skip_validation_class %>").length == 0
-          formStatus = false;
-          JqAjaxCore2.Validation.addErrorToInput($(this), validationResult.message)
-        #else
-        #  JqAjaxCore2.Validation.removeErrorFromInput($(this))
+      validationResult = JqAjaxCore2.Validation.validate<%= mode.to_s.camelize %>($(this))
+      if validationResult.status == false && !$(this).hasClass("<%= JqajaxCore2::Validations.skip_validation_class %>") && $(this).parents(".<%= JqajaxCore2::Validations.skip_validation_class %>").length == 0
+        formStatus = false;
+        JqAjaxCore2.Validation.addErrorToInput($(this), validationResult.message)
+      else
+        JqAjaxCore2.Validation.removeErrorFromInput($(this))
     <% end %>
-
+    
     checkboxesForValidation = form.find("input.<%= JqajaxCore2::Validations.checkbox_validation_class %>")
     checkboxesForValidation.each ->
     # Find the label for the checkbox
-      checkbox_id = $(this).attr("id")
-      label = $("label[for="+checkbox_id+"]")
-
+      checkbox_id = $(this).attr("id")      
+      label = $("label[for="+checkbox_id+"]")  
+     
       if !$(this).is(":checked") && !$(this).hasClass("<%= JqajaxCore2::Validations.skip_validation_class %>") && $(this).parents(".<%= JqajaxCore2::Validations.skip_validation_class %>").length == 0
         formStatus = false
         label.addClass("error")
-        alert("Bitte bestätigen Sie: " + label.text())
       else
         label.removeClass("error")
-
+  
     if formStatus == false || $(form).attr("data-has-error") == "true"
       submitButton.attr("disabled", true)
       submitButton.addClass("disabled")
       ##alert("Bei der Eingabe sind Fehler aufgetreten. Bitte prüfen Sie die markierten Felder.")
-      if $(".error-description")[0]
-        $('html, body').animate
-          scrollTop: $($(".error-description")[0]).offset().top-100, 250
-
+      
     return formStatus
-
-
+    
+  
   # Bind validation to all forms that can be found
   initForms: ->
-
-    main_selector = "[class*=<%= JqajaxCore2::Validations.prefix %>]"
-
-    for field in $("input"+main_selector+":first, :input"+main_selector+":first")
-      $("form").addClass("<%= JqajaxCore2::Validations.form_validation_class %>")
-
-    for field in $("input"+main_selector+", :input"+main_selector)
-      wrapper_class = "<%= JqajaxCore2::Validations.prefix %>-wrapper"
-      wrapper_class = wrapper_class + " " + $(field).attr("type") + "-wrapper"
-      if $(field).attr('data-wrapper-class')
-        wrapper_class = wrapper_class + ' ' + $(field).attr('data-wrapper-class')
-
-      wrapper = '<span class="'+ wrapper_class + '"></span>'
-      if field.type == 'checkbox' && $(field).siblings('label[for="' + field.id + '"]').length != 0
-        $('#' + field.id + ', label[for="' + field.id + '"]').wrapAll(wrapper)
-      else
-        $(field).wrap(wrapper)
-      <% if JqajaxCore2::Config.core[:show_validation_hints] == true %>
-      if $(field).attr('data-validation-messages')
-        messages_converted = $(field).attr('data-validation-messages').split(";").join("<br />")
-        $(field).before("<div data-<%= JqajaxCore2::Config.prefix %>-validation-hint class='<%= JqajaxCore2::Validations.validation_description_class %>'><span class='validation_tooltip'>"+ messages_converted + "</span></div>");
-        if $(field).is(':visible') == false
-          $(field).prev().hide()
-        JqAjaxCore2.Helpers.assignTooltipDimensions($(field).prev().find(".validation_tooltip"))
-      <% end %>
-
+    $("input[class*=<%= JqajaxCore2::Validations.prefix %>]:first, :input[class^=<%= JqajaxCore2::Validations.prefix %>]:first").each ->
+      $(this).closest("form").addClass("<%= JqajaxCore2::Validations.form_validation_class %>")
+    
     $("form.<%= JqajaxCore2::Validations.form_validation_class %>").submit ->
-
+    
       return JqAjaxCore2.Validation.validateForm(this)
-
+  
   # Helper methods
   addErrorToInput: (el, message) ->
     # remove old error msg if present
     if $(el).prev().hasClass("<%= JqajaxCore2::Validations.error_description_class %>")
       $(el).prev().remove()
-
+      
     $(el).addClass("error")
-    $(el).parent().addClass("error")
-
-    console.log $(el).parent()
-
+        
     # label form as error
     $($(el).parents("form")[0]).attr("data-has-error", "true")
-    $(el).before("<div data-<%= JqajaxCore2::Config.prefix %>-error-indicator class='<%= JqajaxCore2::Validations.error_description_class %>'><span class='error_tooltip'>"+ message + "</span></div>");
-    JqAjaxCore2.Helpers.assignTooltipDimensions($(el).prev().find(".error_tooltip"))
-
+    $(el).before("<div class='<%= JqajaxCore2::Validations.error_description_class %>'>"+ message + "</div>");
+  
   removeErrorFromInput: (el) ->
     $(el).removeClass("error")
-    $(el).parent().removeClass("error")
-
-
-
-
-JqAjaxCore2.ValidationErrorMessages =
+      
+JqAjaxCore2.ValidationErrorMessages = 
   <% JqajaxCore2::Validations.settings.each do |name, settings|  %>
     <%= name.to_s.camelize %>: '<%= settings[:message] %>'
-  <% end %>
+  <% end %>  

data/app/assets/javascripts/jqac2/widgets.js.coffee

@@ -1,4 +1,3 @@
-window.JqAjaxCore2= {} if typeof(window.JqAjaxCore2) is 'undefined' 
 window.JqAjaxCore2.Widgets = 
   initSlidedownBoxes: ->
     boxes = $(".js-slide-down-box.plain")

data/app/assets/javascripts/jqajax-core2.js.erb

@@ -5,4 +5,3 @@
 //= require "jqac2/widgets"
 //= require "jqac2/validation"
 //= require "jqac2/initializer"
-//= require_tree "./jqac2/widget_classes"

data/app/helpers/jqajax_core_helper.rb

@@ -1,139 +1,133 @@
 # -*- encoding : utf-8 -*-
 module JqajaxCoreHelper
-
-
+  
+  
   #== New and shiny polished Rails 3.2 Ajax Helper Functions
-
+  
   # Default Ajax Link for Links
   def default_ajax_link(options ={})
     link_data = init_link_data(options)
-
+    
     link_data.merge!(:title => options[:title])
     options[:class] ||= ""
     options[:class] << " #{JqajaxCore2::Config.core[:ajax_link_class]} #{JqajaxCore2::Config.core[:no_ajax_link_class]}"
-
+    
     if options[:append] == true
       link_data.merge!(JqajaxCore2::Config.html_data[:append] => true)
-    end
-
+    end  
+    
     # Load-Message setzen: Entweder default oder eigene Nachricht
     if options[:load_message] && (options[:load_message] != false && !options[:load_message].blank?)
       options[:class] << " #{AJAX_LOAD_MESSAGE_TRIGGER}"
       if options[:load_message].is_a?(String)
         link_data.merge!(JqajaxCore2::Config.loading[:load_message].to_s => options[:load_message])
-      end
+      end    
     elsif options[:load_message] == false
       options[:class]   << " #{AJAX_HIDE_LOAD_MESSAGE_SELECTOR}"
-    end
-
+    end  
+    
     link_data.merge!(html_defaults_from_options(options))
-
+    
     return link_data
-  end
-
-  #
+  end  
+  
+  # 
   def select_onchange_data(options ={})
     link_data = init_link_data(options)
-
-    link_data.merge!(:disabled  => options[:disabled])
+    
+    link_data.merge!(:disabled  => options[:disabled])  
     options[:class] ||= ""
     options[:class] << " #{JqajaxCore2::Config.core[:select_onchange_selector]} #{JqajaxCore2::Config.core[:no_ajax_link_class]}"
 
-    options[:with] ||= :id
+    options[:with] ||= :id  
 
     options[:url].merge!(options[:with] => JqajaxCore2::Config.core[:url_placeholder])
-
-    url_scope = options[:scope].nil? ? main_app : options[:scope]
-
-    link_data.merge!(JqajaxCore2::Config.html_data[:target_url].to_s => url_scope.url_for(options[:url]))
-
+    link_data.merge!(JqajaxCore2::Config.html_data[:target_url].to_s => (options[:scope] || main_app).url_for(options[:url]))
+    
     # Load-Message setzen: Entweder default oder eigene Nachricht
     if options[:load_message] && (options[:load_message] != false && !options[:load_message].blank?)
       options[:class] << " #{AJAX_LOAD_MESSAGE_TRIGGER}"
       if options[:load_message].is_a?(String)
         link_data.merge!(JqajaxCore2::Config.loading[:load_message].to_s => options[:load_message])
-      end
+      end    
     elsif options[:load_message] == false
       options[:class]   << " #{AJAX_HIDE_LOAD_MESSAGE_SELECTOR}"
     end
-
+    
     link_data.merge!(html_defaults_from_options(options))
-
+    
     return link_data
   end
-
-
-
-  # Creates a box that slides down and up to show/hide the content.
+  
+  
+  
+  # Creates a box that slides down and up to show/hide the content. 
   # * Use ':open => true' to set the box open by default
   # * Use ':default_class => "className"' to set the class used for the header
   def slide_down_box(title, options = {:open => false}, &block)
     options[:default_class] ||= "icon-arrow-right"
     options[:type]        ||= :div
-
-
+    
+    
     box_session_id = Digest::SHA1.hexdigest("#{params[:action]}-#{title}")
-
+    
     open = options[:open] #|| (session[:slidedown_boxes_open].include?(box_session_id) rescue false)
-
+    
     concat raw("<div class='js-slide-down-box  plain #{'open' if open} #{options[:box_class]} #{options[:class]}' data-session-id='#{box_session_id}'>
     <#{options[:type]} class='#{options[:default_class]} js-slidedown-button'>
     #{title}
     </#{options[:type]}>
-    <div class='js-slidedown-content'>")
+    <div class='js-slidedown-content'>") 
     yield
-    concat raw("</div></div>")
+    concat raw("</div></div>")  
   end
-
-
-
+  
+  
+  
   def init_slidedown
     raw("<script type='text/javascript'>init_slidedown();</script>")
   end
-
-
+  
+  
   private
-
+  
   def init_link_data(options = {})
     link_data = {:remote => true }
     link_data.merge!(:method => options[:method]) if options[:method]
     link_data.merge!(update_div_from_options(options))
     link_data.merge!(submit_from_options(options))
     link_data.merge!(callback_from_options(options))
-    link_data.merge!(confirm_message_from_options(options))
+    link_data.merge!(confirm_message_from_options(options))  
     return link_data
-  end
-
+  end  
+  
   def confirm_message_from_options(options = {})
     # Confirm-Message setzen: Entweder default, oder eigene Nachricht
     if options[:confirm]
-      { JqajaxCore2::Config.html_data[:confirm] => (options[:confirm] == true ? JqajaxCore2::Config.core[:confirm_default] : options[:confirm].to_s )}
+      { JqajaxCore2::Config.html_data[:confirm] => (options[:confirm] == true ? JqajaxCore2::Config.core[:confirm_default] : options[:confirm].to_s )} 
     else
       return {}
-    end
+    end   
   end
-
+  
   def callback_from_options(options = {})
     options[:callback] ? {JqajaxCore2::Config.html_data[:callback] => options[:callback]} : {}
   end
-
-  def submit_from_options(options = {})
-    options[:submit] ? {
-      JqajaxCore2::Config.html_data[:submit_data] => options[:submit],
-      :method => "POST"
-    } : {}
+  
+  def submit_from_options(options = {})    
+    options[:submit] ? {JqajaxCore2::Config.html_data[:submit_data] => options[:submit]} : {}
   end
-
+  
   def update_div_from_options(options = {})
     options[:update]  ?  { JqajaxCore2::Config.core[:update_div] => options[:update]} : {}
   end
-
-  def html_defaults_from_options(options = {})
-    l = {}
+  
+  def html_defaults_from_options(options = {})  
+    l = {} 
     l.merge!(:class => options[:class])
     l.merge!(:id    => options[:id])
     l.merge!(:style => options[:style])
     return l
-  end
-
+  end  
+  
 end

data/app/helpers/jqajax_validation_helper.rb

@@ -1,76 +1,47 @@
 module JqajaxValidationHelper
-
+  
   def jqac2_validation_for(*vtypes)
     if vtypes.last.is_a?(Hash)
       options = vtypes.last
       vtypes.pop
     else
       options = {}
-    end
-
-    current_data_attributes = options.delete(:data) || {}
-
-    # if a custom class for the form field wrapper is required....
-    current_data_attributes.merge!(wrapper_class: options[:wrapper_class]) if options[:wrapper_class]
+    end    
+    
 
+    
     # validierungsoptionen
     if options[:validator_options]
       options[:validator_options].each do |opt, val|
         options.merge!(jqac2_data_attribute_for(opt) => val)
-      end
+      end  
       options.delete(:validator_options)
-    end
-
-    data_messages = []
-    if options[:hint]
-      data_messages << options[:hint]
-    end
-
+    end  
+    
     vtypes.each do |vtype|
       if JqajaxCore2::Validations.settings[vtype.to_sym]
         options.merge!(:class => [options[:class], JqajaxCore2::Validations.settings[vtype.to_sym][:class]].compact.join(" "))
-        if I18n.exists?("jqac2.validations.hints.#{vtype}") && options[:show_hint] == true
-          data_messages << I18n.t("jqac2.validations.hints.#{vtype}")
-        end
+        
       elsif vtype.nil?
         options
-      else
+      else  
         raise ArgumentError, "Validation of type #{vtype} is not known"
-      end
-    end
-
-    if data_messages.any?
-      current_data_attributes.merge!(validation_messages: data_messages.compact.join(";"))
-    end
-
-    return options.merge(data: current_data_attributes)
-  end
-
-  def jqac2_validation_class_for(*vtypes)
-    css = []
-    vtypes.each do |vtype|
-      if !vtype.nil?
-        if JqajaxCore2::Validations.settings[vtype.to_sym]
-          css << JqajaxCore2::Validations.settings[vtype.to_sym][:class]
-        else
-          raise ArgumentError, "Validation of type #{vtype} is not known"
-        end
-      end
-    end
-
-    return css.join(" ")
+      end    
+    end  
+    
+     return options
   end
-
+  
   def jqac2_validate_form
     JqajaxCore2::Validations.form_validation_class
-  end
-
+  end  
+  
   def jqac2_data_attribute_for(m="bla")
     "data-#{JqajaxCore2::Validations.data_prefix}-#{m.to_s.dasherize}"
-  end
-
-  def init_jqac2_validator
+  end    
+  
+  def init_jqac2_validator 
     javascript_tag("JqAjaxCore2.Validation.initForms()")
-  end
-
-end
+  end  
+  
+end  

data/app/views/jqajax/_loader.html.erb

@@ -1,4 +1,4 @@
 <div class="jqac-inline-loader cf">
-<div class="overlay-loader"><img src="<%= JqajaxCore2::Config.loading[:loader_img] %>"></div>
+<div class="overlay-loader"><%= image_tag(JqajaxCore2::Config.loading[:loader_img]) %></div>
 <div class="overlay-title">{TXT}</div>
 <%= link_to JqajaxCore2::Config.overlay[:hide_label], "#", :class => "overlay-link" %>

data/lib/jqajax_core2/validations.rb

@@ -1,86 +1,56 @@
 module JqajaxCore2
   class Validations
-
-    cattr_accessor :settings, :checkbox_validation_class, :skip_validation_class, :form_validation_class, :prefix,  :data_prefix, :error_description_class, :validation_description_class
-
+    
+    cattr_accessor :settings, :checkbox_validation_class, :skip_validation_class, :form_validation_class, :prefix,  :data_prefix, :error_description_class
+    
     self.prefix = "#{JqajaxCore2::Config.prefix}-vld"
     self.data_prefix = "data-#{JqajaxCore2::Config.prefix}"
-
+    
     # Defition der Verüfgbaren validierungen:
     # - Ist :regexp gesetzt, wird automatisch eine Validierungsfunktion für die Regexp in JS angelegt
     #   bei fehler wird die :message zurückgegeben
     # - Ist keine Regexp angegeben muss eine Funktion manuell erstellt werden
-
+    
     self.settings = {
-
+    
       :email => {
         :class => "#{self.prefix}-email-validation",
         :regexp => '/[a-zA-Z0-9\.\-_]{1,}@[a-zA-Z0-9\.\-_]{1,}\.[a-zA-Z0-9\.\-_]{2,4}/',
         :message => "Keine gültige E-Mail-Adresse"
       },
-
+    
       :phone => {
         :class => "#{self.prefix}-phone-validation",
-        :regexp => '/[0-9+]{1,}[0-9\ \/]{1,}/',
-        :message => "Keine gültige Telefonnummer"
-      },
-
-      :phone_int => {
-        :class => "#{self.prefix}-phone-int-validation",
         :regexp => '/\+[1-9]{1}[0-9]{1,3}\ ?[0-9\ ]{1,}/',
-        :message => "Keine gültige Telefonnummer (Format +xx xxx...)"
-      },
-
-      :letters_only => {
-        class: "#{self.prefix}-letters-validation",
-        regexp: '/^[A-z\ ]+$/',
-        message: "Nur Buchstaben und Leerzeichen"
-      },
-
-      :alphanumeric => {
-        class: "#{self.prefix}-alphanum-validation",
-        regexp: '/^[A-z0-9\ ]+$/',
-        message: "Nur Buchstaben, Zahlen und Leerzeichen"
+        :message => "Keine gültige Telefonnummer"
       },
-
+    
       :zip => {
         :class => "#{self.prefix}-zip-validation",
         :regexp => '/[0-9]{4,5}/',
-        :message => "Ungültige PLZ"
+        :message => "Ungültige PLZ",
       },
-
+      
       :number => {
         :class => "#{self.prefix}-nr-validation",
         :regexp => '/[0-9\ ]{1,}/',
         :message => "Ungültige Zahl",
       },
       
-      :currency => {
-        :class => "#{self.prefix}-currency-validation",
-        :regexp => '/[0-9\.\,0]{1,}/',
-        :message => "Ungültige Eingabe",
-      },
-
       #== Validations for dates etc...
       :date => {
         :class => "#{self.prefix}-date-validation",
         # TODO: Regexp does not catch fake dates like 99.99.9999
         :regexp => "/([0-9]{2}\.[0-9]{2}\.[0-9]{4})|([0-9]{4}-[0-9]{2}-[0-9]{2})/",
-        :message => "Ungültiges Datum"
+        :message => "Ungültiges Datum",
       },
-
+      
       :datemonth => {
         :class => "#{self.prefix}-date-month-validation",
         :regexp => "/[0-9]{2}\.[0-9]{4}/",
         :message => "Ungültiges Format (MM.JJJJ)",
       },
-
-      :datetime => {
-        :class => "#{self.prefix}-datetime-validation",
-        :regexp => "/[0-9]{2}\.[0-9]{2}\.[0-9]{4}\ [0-9]{2}\:[0-9]{2}/",
-        :message => "Ungültiges Format (DD.MM.YYYY HH:MM)",
-      },
-
+      
       #:date_in_future => {
       #  :class => "#{self.prefix}-date-in-future-validation",
       #  :message => "Datum darf nicht in der Vergangenheit liegen",
@@ -91,57 +61,54 @@ module JqajaxCore2
       #  :data => {:min_age => 18}
       #  :message => "Ungültiges Geburtsdatum",
       #}
-
-
+      
+      
       #== Validations for Passwords, Confirmation etc...
-
+      
       :password_simple => {
         :class => "#{self.prefix}-simple-pass-validation",
         # Data-Attributes used by the method, and their default values
         :data => {:length => 6},
         :message => "Min. [Length] Zeichen, min. Buchstaben und Zahlen"
-
+        
       },
-
+      
       :confirmation => {
         :class => "#{self.prefix}-confirmation",
         :data => {:confirm_field => "", :confirm_name => ""},
         :message => "Bestätigung von [ConfirmName] stimmt nicht überein"
       },
-
+      
       :exact => {
         :class => "#{self.prefix}-exact-validation",
         :data => {:value => ""},
         :message => "Eingabe ungültig"
       },
-
+      
       :length => {
         :class => "#{self.prefix}-length-validation",
         :data => {:length => 0},
         :message => "[Length] Zeichen"
       },
-
+    
       :required => {
         :class => "#{self.prefix}-required-validation",
         :regexp => '/[a-zA-Z0-9]{1,}/',
         :empty => false,
         :message => "Pflichtfeld"
       },
-
+      
       :from_service => {
         :class => "#{self.prefix}-from-service",
         :data => {:url => "#", :additional_values => {}.to_json }
-      },
-
-      :none => {
-        class: "#{self.prefix}-none"
       }
     }
-
+    
+    
     self.checkbox_validation_class  = "#{self.prefix}-validate-checkbox"
     self.skip_validation_class      = "#{self.prefix}-skip-validation"
     self.form_validation_class      = "#{self.prefix}-form-validation"
     self.error_description_class    = "error-description"
-    self.validation_description_class = "validation-description"
   end
-end
+end  
+    

data/lib/jqajax_core2.rb

@@ -13,10 +13,10 @@ JqajaxCore2::Config.core[:no_ajax_link_class] ||= "#{p}-not-loaded"
 JqajaxCore2::Config.core[:select_onchange_selector]   ||= "#{p}-select-onchange"
 
 # HTML data-Attribute for specifing the div to be updated
-JqajaxCore2::Config.core[:update_div] ||= "data-jqac2-update-element"
+JqajaxCore2::Config.core[:update_div] ||= "data-jqac2-update-element"  
 
 # id name of the main Ajax Overlay Container
-JqajaxCore2::Config.core[:ajax_content_container_id] ||= "jqac2-ajax-content"
+JqajaxCore2::Config.core[:ajax_content_container_id] ||= "jqac2-ajax-content"  
 
 # Placeholder string in URLS
 JqajaxCore2::Config.core[:url_placeholder]  ||= ".-."
@@ -24,9 +24,6 @@ JqajaxCore2::Config.core[:url_placeholder]  ||= ".-."
 # Confirmation
 JqajaxCore2::Config.core[:confirm_default]  ||= "Sind Sie sicher das Sie fortfahren möchten?"
 
-# Hinweise für Validierte Felder zeigen?
-JqajaxCore2::Config.core[:show_validation_hints] ||= false
-
 #== Overlay and Loader Settings
 JqajaxCore2::Config.overlay[:div_id]      ||= "#{p}-overlay"
 JqajaxCore2::Config.overlay[:hide_label]  ||= "ausblenden"
@@ -40,11 +37,9 @@ JqajaxCore2::Config.overlay[:enable_on_page_unload] ||= true
 
 # div area for showing flash notice/errors
 JqajaxCore2::Config.loading[:flash_area_div]        ||= "#{p}-flash-area"
-JqajaxCore2::Config.loading[:loader_img]            ||= "/ajax-loader.gif"
+JqajaxCore2::Config.loading[:loader_img]            ||= "ajax-loader.gif"
 JqajaxCore2::Config.loading[:flash_area_position]   ||= :bottom_right
 JqajaxCore2::Config.loading[:load_message]          ||= "data-jqac2-loading"
-JqajaxCore2::Config.loading[:notify_display_duration] ||= 5000
-
 
 #== Modal Settings
 JqajaxCore2::Config.modal[:max_width_factor]  ||= 0.9

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jqajax_core2
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.81
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -56,16 +56,16 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,6 @@ files:
 - app/assets/javascripts/jqac2/loading.js.coffee.erb
 - app/assets/javascripts/jqac2/modal.js.coffee.erb
 - app/assets/javascripts/jqac2/validation.js.coffee.erb
-- app/assets/javascripts/jqac2/widget_classes/checkbox_slidedown.coffee
 - app/assets/javascripts/jqac2/widgets.js.coffee
 - app/assets/javascripts/jqajax-core2.js.erb
 - app/assets/stylesheets/jqajax-core2.scss.erb
@@ -125,7 +124,6 @@ files:
 - app/views/layouts/_ajax_overlay.html.erb
 - app/views/layouts/_info_overlay.html.erb
 - app/views/layouts/jqac2_modal.html.erb
-- config/locales/jqac2.validations.de.yml
 - config/routes.rb
 - lib/jqajax_core2.rb
 - lib/jqajax_core2/application_controller_ext.rb
@@ -152,8 +150,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Makes Rails Ajax easy
 test_files: []
+has_rdoc: 

data/app/assets/javascripts/jqac2/widget_classes/checkbox_slidedown.coffee

@@ -1,33 +0,0 @@
-class JqAjaxCore2.CheckboxSlidedown
-  constructor: (el) ->
-    @$el = $(el)
-
-    @settings =
-      content_selector: @$el.data("jqac2-checkbox-slidedown-content")
-      trigger_selector: @$el.data("jqac2-checkbox-slidedown-trigger")
-      open: @$el.data("jqac2-checkbox-slidedown-open") || 'false'
-
-    @$content = @$el.find(@settings.content_selector)
-    @$trigger = @$el.find(@settings.trigger_selector)
-
-    @element_id = "s" + Math.random()+Math.random()
-
-    @$checkbox = $('<input id=" ' + @element_id  + ' " class="jqac2-checkbox-slidedown-trigger" type="checkbox"></input>')
-
-  init: ->
-    # content should be hidden until checkbox was checked
-    @$content.hide()
-
-    # Add checkbox before the trigger element
-    @$trigger.before(@$checkbox)
-    @$checkbox.on 'change', @setContentVisibility
-
-    @setContentVisibility
-
-
-  setContentVisibility: =>
-    if @$checkbox.is(":checked")
-      @$content.show()
-    else
-      @$content.hide()
-

data/config/locales/jqac2.validations.de.yml

@@ -1,12 +0,0 @@
-de:
-  jqac2:
-    validations:
-      hints:
-        phone_int: 'Telefonnummer im intl. Format: +xx xxx...'
-        letters_only: 'Nur Buchstaben (A-Z) und Leerzeichen'
-        alphanumeric: 'Nur Buchstaben (A-Z), Zahlen (0-9) und Leerzeichen'
-        zip: 'Postleitzahl, 4-5-stellige Nummer, führende "0" erlaubt'
-        date: 'Datum im Format TT.MM.JJJJ'
-        datemonth: 'Datum im Format MM.JJJJ'
-        datetime: 'Datum/Uhrzeit im Format DD.MM.YYYY HH:MM'
-        required: 'Pflichtfeld'