rails_admin 0.4.0 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rails_admin might be problematic. Click here for more details.

Files changed (4) hide show
  1. data/app/assets/javascripts/rails_admin/ra.widgets.coffee +11 -11
  2. data/app/assets/javascripts/rails_admin/rails_admin.js.erb +1 -1
  3. data/lib/rails_admin/version.rb +1 -1
  4. metadata +10 -4
data/app/assets/javascripts/rails_admin/ra.widgets.coffee CHANGED
@@ -148,24 +148,24 @@ $(document).live 'rails_admin.dom_ready', ->
148
148
 
149
149
  # ckeditor
150
150
 
151
- goCkeditors = (array) =>
152
- array.each (index, domEle) ->
151
+ goCkeditors = ->
152
+ $('form [data-richtext=ckeditor]').not('.ckeditored').each (index, domEle) ->
153
153
  options = $(this).data
154
154
  if instance = window.CKEDITOR.instances[this.id]
155
- instance.destroy(true)
155
+ instance.destroy(true)
156
+
156
157
  window.CKEDITOR.replace(this, options['options'])
157
158
  $(this).addClass('ckeditored')
158
159
 
159
- array = $('form [data-richtext=ckeditor]').not('.ckeditored')
160
- if array.length
161
- @array = array
160
+ $editors = $('form [data-richtext=ckeditor]').not('.ckeditored')
161
+ if $editors.length
162
162
  if not window.CKEDITOR
163
- options = $(array[0]).data('options')
163
+ options = $editors.first().data('options')
164
164
  window.CKEDITOR_BASEPATH = options['base_location']
165
165
  $.getScript options['jspath'], (script, textStatus, jqXHR) =>
166
- goCkeditors(@array)
166
+ goCkeditors()
167
167
  else
168
- goCkeditors(@array)
168
+ goCkeditors()
169
169
 
170
170
  #codemirror
171
171
 
@@ -200,9 +200,9 @@ $(document).live 'rails_admin.dom_ready', ->
200
200
  array = $('form [data-richtext=bootstrap-wysihtml5]').not('.bootstrap-wysihtml5ed')
201
201
  if array.length
202
202
  @array = array
203
+ options = $(array[0]).data('options')
204
+ config_options = $.parseJSON(options['config_options'])
203
205
  if not window.wysihtml5
204
- options = $(array[0]).data('options')
205
- config_options = $.parseJSON(options['config_options'])
206
206
  $('head').append('<link href="' + options['csspath'] + '" rel="stylesheet" media="all" type="text\/css">')
207
207
  $.getScript options['jspath'], (script, textStatus, jqXHR) =>
208
208
  goBootstrapWysihtml5s(@array, config_options)
data/app/assets/javascripts/rails_admin/rails_admin.js.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  require_asset 'jquery'
4
4
  require_asset 'jquery_ujs'
5
5
  require_asset 'jquery.remotipart'
6
- require_asset 'jquery.effects.core'
6
+ require_asset 'jquery.ui.effect'
7
7
  require_asset 'jquery.ui.sortable'
8
8
  require_asset 'jquery.ui.autocomplete'
9
9
  require_asset 'jquery.ui.datepicker'
data/lib/rails_admin/version.rb CHANGED
@@ -2,7 +2,7 @@ module RailsAdmin
2
2
  class Version
3
3
  MAJOR = 0 unless defined? MAJOR
4
4
  MINOR = 4 unless defined? MINOR
5
- PATCH = 0 unless defined? PATCH
5
+ PATCH = 1 unless defined? PATCH
6
6
  PRE = nil unless defined? PRE
7
7
 
8
8
  class << self
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: rails_admin
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.4.0
5
+ version: 0.4.1
6
6
  platform: ruby
7
7
  authors:
8
8
  - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2013-01-06 00:00:00.000000000 Z
15
+ date: 2013-01-12 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  version_requirements: !ruby/object:Gem::Requirement
@@ -68,6 +68,9 @@ dependencies:
68
68
  - - ~>
69
69
  - !ruby/object:Gem::Version
70
70
  version: '3.0'
71
+ - - ! '>='
72
+ - !ruby/object:Gem::Version
73
+ version: 3.0.0.1
71
74
  none: false
72
75
  name: font-awesome-sass-rails
73
76
  type: :runtime
@@ -77,13 +80,16 @@ dependencies:
77
80
  - - ~>
78
81
  - !ruby/object:Gem::Version
79
82
  version: '3.0'
83
+ - - ! '>='
84
+ - !ruby/object:Gem::Version
85
+ version: 3.0.0.1
80
86
  none: false
81
87
  - !ruby/object:Gem::Dependency
82
88
  version_requirements: !ruby/object:Gem::Requirement
83
89
  requirements:
84
90
  - - ~>
85
91
  - !ruby/object:Gem::Version
86
- version: '2.0'
92
+ version: '3.0'
87
93
  none: false
88
94
  name: jquery-ui-rails
89
95
  type: :runtime
@@ -92,7 +98,7 @@ dependencies:
92
98
  requirements:
93
99
  - - ~>
94
100
  - !ruby/object:Gem::Version
95
- version: '2.0'
101
+ version: '3.0'
96
102
  none: false
97
103
  - !ruby/object:Gem::Dependency
98
104
  version_requirements: !ruby/object:Gem::Requirement