ab_admin 0.3.1 → 0.3.2

data/app/assets/javascripts/ab_admin/components/google_translate.js.coffee

@@ -11,7 +11,7 @@ window.translate = (text, element, from, to) ->
 
     success: (result) ->
       translated = result.data.translations[0].translatedText
-      element.ck_val $.unescape(translated)
+      element.inputVal $.unescape(translated)
 
     error: (XMLHttpRequest, textStatus, errorThrown) ->
       alert "Error translate " + text + " message " + textStatus
@@ -21,10 +21,10 @@ window.google_t = (text, element, from, to) ->
   return '' unless $.trim(text)
   opts = {q: text, from: from, to: to}
   $.post '/admin/translate', opts, ((data) =>
-    element.ck_val $.unescape(data.text).replace(/%\s{/g, ' %{')), 'json'
+    element.inputVal $.unescape(data.text).replace(/%\s{/g, ' %{')), 'json'
 
 # get value of text field or CKEDITOR area
-$.fn.ck_val = (v = null) ->
+$.fn.inputVal = (v = null) ->
   $el = $(this)
   el_id = $el.attr('id')
   ck_obj = CKEDITOR?.instances[el_id]
@@ -33,6 +33,11 @@ $.fn.ck_val = (v = null) ->
       ck_obj.setData(v)
     else
       ck_obj.getData()
+  else if $el.data('wysihtml5')
+    if v
+      $el.data('wysihtml5').editor.setValue(v, true)
+    else
+      $el.val()
   else
     if v
       $el.val(v)
@@ -68,8 +73,8 @@ class window.GoogleLocaleTabs
               regexp = RegExp("#{to}$")
               el_from_id = $el_to.attr('id').replace(regexp, from)
               $el_from = $("##{el_from_id}")
-              if $el_from.ck_val().length < @limit
-                google_t($el_from.ck_val(), $el_to, from, to)
+              if $el_from.inputVal().length < @limit
+                google_t($el_from.inputVal(), $el_to, from, to)
 
 $ ->
   if $('.locale_tabs')[0]

data/app/assets/javascripts/ab_admin/components/in_place_edit.js.coffee

@@ -21,3 +21,4 @@ $(document).on 'admin:init', (e) ->
   return unless window.viewType == 'list'
   $('.editable').editable
     onblur: 'submit'
+    placement: 'bottom'

data/app/assets/javascripts/ab_admin/main.js

@@ -4,9 +4,9 @@
 //= require jquery.cookie
 //= require jquery.pjax
 //= require jquery.ui.nestedSortable
-//= require jquery_nested_form
 //= require jquery.hotkeys
 //= require bootstrap
+//= require ab_admin/jquery_nested_form
 //= require ab_admin/bootstrap-tab-multi
 //= require ab_admin/bootstrap-datepicker/core
 //= require ab_admin/bootstrap-datepicker/locales/bootstrap-datepicker.ru.js

data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.css.scss

@@ -60,7 +60,6 @@ ul.nav li.dropdown:hover ul.dropdown-menu {
 
 .popover-inner {
   width: auto;
-  max-width: 500px;
 }
 
 .label-primary, .badge-primary {

data/lib/ab_admin/core_ext/hash.rb

@@ -96,6 +96,14 @@ class Hash
     self
   end
 
+  def downcase_keys
+    new_hash = {}
+    self.each do |k, v|
+      new_hash[k.to_s.downcase] = v
+    end
+    new_hash
+  end
+
   def no_blank
     reject { |k, v| v.blank? }
   end

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/ab_admin/views/form_builder.rb

@@ -17,10 +17,13 @@ module AbAdmin
       def input(attribute_name, options = {}, &block)
         unless options.key?(:fancy)
           if (!options.key?(:as) || options[:as] == :select) && options[:collection].respond_to?(:size) && options[:collection].size > 10
-            options[:input_html] ||= {}
-            options[:input_html][:class] = "#{options[:input_html][:class]} fancy_select"
+            options[:fancy] = true
           end
         end
+        if options[:fancy]
+          options[:input_html] ||= {}
+          options[:input_html][:class] = "#{options[:input_html][:class]} fancy_select"
+        end
 
         case options[:as]
           when :uploader

metadata

@@ -2,14 +2,14 @@
 name: ab_admin
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -1045,13 +1045,13 @@ files:
 - vendor/assets/javascripts/ab_admin/fileupload/admin-fileuploader.js.coffee
 - vendor/assets/javascripts/ab_admin/fileupload/fileuploader.js
 - vendor/assets/javascripts/ab_admin/jquery.Jcrop.js
+- vendor/assets/javascripts/ab_admin/jquery_nested_form.js.coffee
 - vendor/assets/javascripts/bootstrap-wysihtml5/locales/ru.js
 - vendor/assets/javascripts/jquery.cookie.js
 - vendor/assets/javascripts/jquery.hotkeys.js
 - vendor/assets/javascripts/jquery.pjax.js
 - vendor/assets/javascripts/jquery.tmpl.min.js
 - vendor/assets/javascripts/jquery.ui.nestedSortable.js
-- vendor/assets/javascripts/jquery_nested_form.js.coffee
 - vendor/assets/stylesheets/ab_admin/bootstrap-datepicker.css.scss
 - vendor/assets/stylesheets/ab_admin/bootstrap-timepicker.css.scss
 - vendor/assets/stylesheets/ab_admin/jquery.Jcrop.min.css.scss
@@ -1068,7 +1068,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2604856531644655498
+      hash: 1695835720200217105
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -1077,7 +1077,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2604856531644655498
+      hash: 1695835720200217105
   none: false
 requirements: []
 rubyforge_project: