active_scaffold 3.1.18 → 3.1.19

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -275,7 +275,7 @@ jQuery(document).ready(function() {
  Slight modifications by Elliot Winkler
 */
 
-if (typeof($.fn.delayedObserver) === 'undefined') { 
+if (typeof(jQuery.fn.delayedObserver) === 'undefined') { 
   (function() {
     var delayedObserverStack = [];
     var observed;
@@ -303,7 +303,7 @@ if (typeof($.fn.delayedObserver) === 'undefined') {
       );
     }
    
-    $.fn.extend({
+    jQuery.fn.extend({
       delayedObserver:function(delay, callback){
         $this = jQuery(this);
        
@@ -362,7 +362,7 @@ var ActiveScaffold = {
   },
   reload_if_empty: function(tbody, url) {
     if (this.records_for(tbody).length == 0) {
-      $.getScript(url);
+      jQuery.getScript(url);
     }
   },
   removeSortClasses: function(scaffold) {
@@ -543,7 +543,7 @@ var ActiveScaffold = {
   process_checkbox_inplace_edit: function(checkbox, options) {
     var checked = checkbox.is(':checked');
     if (checked === true) options['params'] += '&value=1';
-    $.ajax({
+    jQuery.ajax({
       url: options.url,
       type: "POST",
       data: options['params'],
@@ -638,14 +638,14 @@ var ActiveScaffold = {
       sortable_options.update = function(event, ui) {
          var url = controller + '/' + options.action + '?'
          url += jQuery(this).sortable('serialize',{key: encodeURIComponent(jQuery(this).attr('id') + '[]'), expression:/^[^_-](?:[A-Za-z0-9_-]*)-(.*)-row$/});
-         $.post(url.append_params(url_params));
+         jQuery.post(url.append_params(url_params));
        }
     }
     element.sortable(sortable_options);
   },
 
   record_select_onselect: function(edit_associated_url, active_scaffold_id, id){
-    $.ajax({
+    jQuery.ajax({
       url: edit_associated_url.split('--ID--').join(id),
       error: function(xhr, textStatus, errorThrown){
         ActiveScaffold.report_500_response(active_scaffold_id)
@@ -750,13 +750,13 @@ var ActiveScaffold = {
 
     if (send_form) {
       params = as_form.serialize();
-      params += '&' + $.param({"source_id": source_id});
+      params += '&' + jQuery.param({"source_id": source_id});
     } else {
       params = {value: val};
       params.source_id = source_id;
     }
 
-    $.ajax({
+    jQuery.ajax({
       url: url,
       data: params,
       beforeSend: function(event) {
@@ -962,7 +962,7 @@ ActiveScaffold.Actions.Record = ActiveScaffold.Actions.Abstract.extend({
 ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   close_previous_adapter: function() {
     var _this = this;
-    $.each(this.set.links, function(index, item) {
+    jQuery.each(this.set.links, function(index, item) {
       if (item.url != _this.url && item.is_disabled() && item.adapter) {
         item.enable();
         item.adapter.remove();
@@ -1001,7 +1001,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
 
   enable: function() {
     var _this = this;
-    $.each(this.set.links, function(index, item) {
+    jQuery.each(this.set.links, function(index, item) {
       if (item.url != _this.url) return;
       item.tag.removeClass('disabled');
     });
@@ -1009,7 +1009,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
 
   disable: function() {
     var _this = this;
-    $.each(this.set.links, function(index, item) {
+    jQuery.each(this.set.links, function(index, item) {
       if (item.url != _this.url) return;
       item.tag.addClass('disabled');
     });

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -14,9 +14,14 @@ class ActiveScaffold::Bridges::TinyMce
 
       def active_scaffold_input_text_editor(column, options)
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
+				
+				settings = { :theme => 'simple' }.merge(column.options[:tinymce] || {})
+				settings = settings.to_s.gsub(/:(.+?)\=\>/, '\1:')
+				settings = "tinyMCE.settings = #{settings};"
+
         html = []
         html << send(override_input(:textarea), column, options)
-        html << javascript_tag("tinyMCE.execCommand('mceAddControl', false, '#{options[:id]}');") if request.xhr? || params[:iframe]
+        html << javascript_tag(settings + "tinyMCE.execCommand('mceAddControl', false, '#{options[:id]}');") if request.xhr? || params[:iframe]
         html.join "\n"
       end
 

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -4,7 +4,11 @@ module ActionView
       def find_all_templates(name, partial = false, locals = {})
         prefixes.collect do |prefix|
           view_paths.collect do |resolver|
-            temp_args = *args_for_lookup(name, [prefix], partial, locals)
+            if Rails.version < '3.2.0' # FIXME: remove when rails 3.1 support is dropped
+              temp_args = *args_for_lookup(name, [prefix], partial, locals)
+            else
+              temp_args = *args_for_lookup(name, [prefix], partial, locals, {})
+            end
             temp_args[1] = temp_args[1][0]
             resolver.find_all(*temp_args)
           end

data/lib/active_scaffold/extensions/active_association_reflection.rb

@@ -12,11 +12,11 @@ ActiveRecord::Reflection::AssociationReflection.class_eval do
     end
   end
   def build_association(*opts, &block)
-    self.original_build_association_called = true
+    @original_build_association_called = true # FIXME: remove when 3.1 support is dropped
     klass_with_sti(*opts).new(*opts, &block)
   end
   def create_association(*opts, &block)
-    self.original_build_association_called = true
+    @original_build_association_called = true # FIXME: remove when 3.1 support is dropped
     klass_with_sti(*opts).create(*opts, &block)
   end
 end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 18
+    PATCH = 19
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 3
   - 1
-  - 18
-  version: 3.1.18
+  - 19
+  version: 3.1.19
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 Z
+date: 2012-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement