ab_admin 0.3.1 → 0.3.2
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/javascripts/ab_admin/components/google_translate.js.coffee +10 -5
- data/app/assets/javascripts/ab_admin/components/in_place_edit.js.coffee +1 -0
- data/app/assets/javascripts/ab_admin/main.js +1 -1
- data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.css.scss +0 -1
- data/lib/ab_admin/core_ext/hash.rb +8 -0
- data/lib/ab_admin/version.rb +1 -1
- data/lib/ab_admin/views/form_builder.rb +5 -2
- data/vendor/assets/javascripts/{jquery_nested_form.js.coffee → ab_admin/jquery_nested_form.js.coffee} +0 -0
- metadata +5 -5
@@ -11,7 +11,7 @@ window.translate = (text, element, from, to) ->
|
|
11
11
|
|
12
12
|
success: (result) ->
|
13
13
|
translated = result.data.translations[0].translatedText
|
14
|
-
element.
|
14
|
+
element.inputVal $.unescape(translated)
|
15
15
|
|
16
16
|
error: (XMLHttpRequest, textStatus, errorThrown) ->
|
17
17
|
alert "Error translate " + text + " message " + textStatus
|
@@ -21,10 +21,10 @@ window.google_t = (text, element, from, to) ->
|
|
21
21
|
return '' unless $.trim(text)
|
22
22
|
opts = {q: text, from: from, to: to}
|
23
23
|
$.post '/admin/translate', opts, ((data) =>
|
24
|
-
element.
|
24
|
+
element.inputVal $.unescape(data.text).replace(/%\s{/g, ' %{')), 'json'
|
25
25
|
|
26
26
|
# get value of text field or CKEDITOR area
|
27
|
-
$.fn.
|
27
|
+
$.fn.inputVal = (v = null) ->
|
28
28
|
$el = $(this)
|
29
29
|
el_id = $el.attr('id')
|
30
30
|
ck_obj = CKEDITOR?.instances[el_id]
|
@@ -33,6 +33,11 @@ $.fn.ck_val = (v = null) ->
|
|
33
33
|
ck_obj.setData(v)
|
34
34
|
else
|
35
35
|
ck_obj.getData()
|
36
|
+
else if $el.data('wysihtml5')
|
37
|
+
if v
|
38
|
+
$el.data('wysihtml5').editor.setValue(v, true)
|
39
|
+
else
|
40
|
+
$el.val()
|
36
41
|
else
|
37
42
|
if v
|
38
43
|
$el.val(v)
|
@@ -68,8 +73,8 @@ class window.GoogleLocaleTabs
|
|
68
73
|
regexp = RegExp("#{to}$")
|
69
74
|
el_from_id = $el_to.attr('id').replace(regexp, from)
|
70
75
|
$el_from = $("##{el_from_id}")
|
71
|
-
if $el_from.
|
72
|
-
google_t($el_from.
|
76
|
+
if $el_from.inputVal().length < @limit
|
77
|
+
google_t($el_from.inputVal(), $el_to, from, to)
|
73
78
|
|
74
79
|
$ ->
|
75
80
|
if $('.locale_tabs')[0]
|
@@ -4,9 +4,9 @@
|
|
4
4
|
//= require jquery.cookie
|
5
5
|
//= require jquery.pjax
|
6
6
|
//= require jquery.ui.nestedSortable
|
7
|
-
//= require jquery_nested_form
|
8
7
|
//= require jquery.hotkeys
|
9
8
|
//= require bootstrap
|
9
|
+
//= require ab_admin/jquery_nested_form
|
10
10
|
//= require ab_admin/bootstrap-tab-multi
|
11
11
|
//= require ab_admin/bootstrap-datepicker/core
|
12
12
|
//= require ab_admin/bootstrap-datepicker/locales/bootstrap-datepicker.ru.js
|
data/lib/ab_admin/version.rb
CHANGED
@@ -17,10 +17,13 @@ module AbAdmin
|
|
17
17
|
def input(attribute_name, options = {}, &block)
|
18
18
|
unless options.key?(:fancy)
|
19
19
|
if (!options.key?(:as) || options[:as] == :select) && options[:collection].respond_to?(:size) && options[:collection].size > 10
|
20
|
-
options[:
|
21
|
-
options[:input_html][:class] = "#{options[:input_html][:class]} fancy_select"
|
20
|
+
options[:fancy] = true
|
22
21
|
end
|
23
22
|
end
|
23
|
+
if options[:fancy]
|
24
|
+
options[:input_html] ||= {}
|
25
|
+
options[:input_html][:class] = "#{options[:input_html][:class]} fancy_select"
|
26
|
+
end
|
24
27
|
|
25
28
|
case options[:as]
|
26
29
|
when :uploader
|
File without changes
|
metadata
CHANGED
@@ -2,14 +2,14 @@
|
|
2
2
|
name: ab_admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 0.3.
|
5
|
+
version: 0.3.2
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Alex Leschenko
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-02-
|
12
|
+
date: 2013-02-23 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -1045,13 +1045,13 @@ files:
|
|
1045
1045
|
- vendor/assets/javascripts/ab_admin/fileupload/admin-fileuploader.js.coffee
|
1046
1046
|
- vendor/assets/javascripts/ab_admin/fileupload/fileuploader.js
|
1047
1047
|
- vendor/assets/javascripts/ab_admin/jquery.Jcrop.js
|
1048
|
+
- vendor/assets/javascripts/ab_admin/jquery_nested_form.js.coffee
|
1048
1049
|
- vendor/assets/javascripts/bootstrap-wysihtml5/locales/ru.js
|
1049
1050
|
- vendor/assets/javascripts/jquery.cookie.js
|
1050
1051
|
- vendor/assets/javascripts/jquery.hotkeys.js
|
1051
1052
|
- vendor/assets/javascripts/jquery.pjax.js
|
1052
1053
|
- vendor/assets/javascripts/jquery.tmpl.min.js
|
1053
1054
|
- vendor/assets/javascripts/jquery.ui.nestedSortable.js
|
1054
|
-
- vendor/assets/javascripts/jquery_nested_form.js.coffee
|
1055
1055
|
- vendor/assets/stylesheets/ab_admin/bootstrap-datepicker.css.scss
|
1056
1056
|
- vendor/assets/stylesheets/ab_admin/bootstrap-timepicker.css.scss
|
1057
1057
|
- vendor/assets/stylesheets/ab_admin/jquery.Jcrop.min.css.scss
|
@@ -1068,7 +1068,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
1068
1068
|
version: '0'
|
1069
1069
|
segments:
|
1070
1070
|
- 0
|
1071
|
-
hash:
|
1071
|
+
hash: 1695835720200217105
|
1072
1072
|
none: false
|
1073
1073
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1074
1074
|
requirements:
|
@@ -1077,7 +1077,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1077
1077
|
version: '0'
|
1078
1078
|
segments:
|
1079
1079
|
- 0
|
1080
|
-
hash:
|
1080
|
+
hash: 1695835720200217105
|
1081
1081
|
none: false
|
1082
1082
|
requirements: []
|
1083
1083
|
rubyforge_project:
|