rails_admin 1.0.0.rc → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad179cb9f029df989c979439f2e5debb9b2a8f23
-  data.tar.gz: 2a148ec6c217c0dc67369cb0164bed57db97b953
+  metadata.gz: b5f7c910bef240049b818e4189a241c41e68e180
+  data.tar.gz: ea59f46605ddef6defbe19c6846d3d9ee6419166
 SHA512:
-  metadata.gz: c5c61a2c10d83cdbc00fb163974026eba3a940bd998e674a2e0a256b41f7a9aec821e6aca93a3904bc801d6ee240022bc736b04764bea11953f64ef705ed1d7e
-  data.tar.gz: aa9a9cfb2e7eda6f0fd9b3bc2fe16430eb83120499da7e87f0361a93a3b3734e458ec6ac0a0bd553bb6d25fa7f4829f3e717ad15d6cf195efd4771e3b62b0738
+  metadata.gz: c9c9d4bc637f60e21978c7ce73f693987de692177f79a61ab27757cd75b3ee531575d5bff729361d57c2fad35e82eb48763b5dc4a0c8615394569af7a2a5da5f
+  data.tar.gz: 9f16f21be6393621ee9e3b3de88fa3c4c11e75d2d972b88fe411acc04625568adba1c580ede46ae97c012b637b1d75730b49515d3e0379ea8949806e78f851b2

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
 gem 'devise'
-gem 'remotipart', github: 'mshibuya/remotipart'
 
 group :active_record do
   platforms :jruby do
@@ -43,7 +42,7 @@ group :test do
   gem 'pundit'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'
-  gem 'rubocop', '~> 0.31.0'
+  gem 'rubocop', '~> 0.41.2'
   gem 'simplecov', '>= 0.9', require: false
   gem 'timecop', '>= 0.5'
 

data/README.md

@@ -33,20 +33,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile:
-  - For Rails 5 project:
-
-    ```
-    gem 'remotipart', github: 'mshibuya/remotipart'
-    gem 'rails_admin', '>= 1.0.0.rc'
-    ```
-
-  - For Rails 4 project:
-
-    ```
-    gem 'rails_admin'
-    ```
-
+1. On your gemfile: `gem 'rails_admin', '~> 1.0'`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked

data/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js

@@ -175,22 +175,25 @@
     _queryFilter: function(val) {
       var widget = this;
       widget._query(val, function(matches) {
-        var i;
+
         var filtered = [];
-        for (i in matches) {
-          if (matches.hasOwnProperty(i) && !widget.selected(matches[i].id)) {
+        var i;
+
+        for (i = 0; i < matches.length; i++) {
+          if (!widget.selected(matches[i].id)) {
             filtered.push(i);
           }
         }
         if (filtered.length > 0) {
-          widget.collection.html('');
-          for (i in filtered) {
-            widget.collection.append(
-              $('<option></option>').attr('value', matches[filtered[i]].id).attr('title', matches[filtered[i]].label).text(matches[filtered[i]].label)
-            );
+          widget.collection[0].innerHTML = '';
+          var filteredContainer = [];
+          for (i = 0; i < filtered.length; i++) {
+            var newOptions = '<option value="'+matches[filtered[i]].id+'" title="'+matches[filtered[i]].label+'">'+matches[filtered[i]].label+'</option>';
+            filteredContainer.push(newOptions);
           }
+          widget.collection[0].innerHTML = filteredContainer.join("");
         } else {
-          widget.collection.html(widget.noObjectsPlaceholder);
+          widget.collection[0].innerHTML = widget.noObjectsPlaceholder;
         }
       });
     },
@@ -314,7 +317,9 @@
     },
 
     selected: function(value) {
-      return this.element.find('option[value="' + value + '"]').attr("selected");
+      if (this.selection[0].querySelectorAll('option[value="' + value + '"]')[0]) {
+        return true;
+      }
     },
 
     destroy: function() {

data/app/assets/javascripts/rails_admin/ra.filtering-select.js

@@ -14,7 +14,9 @@
  *   jquery.ui.autocomplete.js
  */
 (function($) {
-  $.widget("ra.filteringSelect", {
+  'use strict';
+
+  $.widget('ra.filteringSelect', {
     options: {
       createQuery: function(query) {
         return { query: query };
@@ -26,135 +28,90 @@
       xhr: false
     },
 
+    button: null,
+    input: null,
+    select: null,
+
     _create: function() {
-      var self = this,
-        select = this.element.hide(),
-        selected = select.children(":selected"),
-        value = selected.val() ? selected.text() : "";
+      var filtering_select;
 
-      if (this.options.xhr) {
-        this.options.source = this.options.remote_source;
+      // When using the browser back and forward buttons, it is possible that
+      // the autocomplete field will be cached which causes duplicate fields
+      // to be generated.
+      if (this.element.is(':visible')) {
+        this.element.hide();
+        filtering_select = this._inputGroup(this.element.attr('id'));
+        this.input = this._inputField();
+        this.button = this._buttonField();
       } else {
-        this.options.source = select.children("option").map(function() {
-          return { label: $(this).text(), value: this.value };
-        }).toArray();
+        filtering_select = this.element.siblings(
+          '[data-input-for="' + this.element.attr('id') + '"]'
+        );
+        this.input = filtering_select.children('input');
+        this.button = filtering_select.children('.input-group-btn');
       }
-      var filtering_select = $('<div class="input-group filtering-select col-sm-2" style="float:left"></div>')
-      var input = this.input = $('<input type="text">')
-        .val(value)
-        .addClass("form-control ra-filtering-select-input")
-        .attr('style', select.attr('style'))
-        .show()
-        .autocomplete({
-          delay: this.options.searchDelay,
-          minLength: this.options.minLength,
-          source: this._getSourceFunction(this.options.source),
-          select: function(event, ui) {
-            var option = $('<option></option>').attr('value', ui.item.id).attr('selected', 'selected').text(ui.item.value);
-            select.html(option);
-            select.trigger("change", ui.item.id);
-            self._trigger("selected", event, {
-              item: option
-            });
-            $(self.element.parents('.controls')[0]).find('.update').removeClass('disabled');
-          },
-          change: function(event, ui) {
-            if (!ui.item) {
-              var matcher = new RegExp("^" + $.ui.autocomplete.escapeRegex($(this).val()) + "$", "i"),
-                  valid = false;
-              select.children("option").each(function() {
-                if ($(this).text().match(matcher)) {
-                  this.selected = valid = true;
-                  return false;
-                }
-              });
-              if (!valid || $(this).val() == '') {
-                // remove invalid value, as it didn't match anything
-                $(this).val(null);
-                select.html($('<option value="" selected="selected"></option>'));
-                input.data("ui-autocomplete").term = "";
-                $(self.element.parents('.controls')[0]).find('.update').addClass('disabled');
-                return false;
-              }
-
-            }
-          }
-        })
-        .keyup(function() {
-          /* Clear select options and trigger change if selected item is deleted */
-          if ($(this).val().length == 0) {
-            select.html($('<option value="" selected="selected"></option>'));
-            select.trigger("change");
-          }
-        })
-
-      if(select.attr('placeholder'))
-        input.attr('placeholder', select.attr('placeholder'))
-
-      input.data("ui-autocomplete")._renderItem = function(ul, item) {
-        return $("<li></li>")
-          .data("ui-autocomplete-item", item)
-          .append( $( "<a></a>" ).html( item.html || item.id ) )
-          .appendTo(ul);
-      };
-
-      var button = this.button = $('<span class="input-group-btn"><label class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="Show All Items" role="button"><span class="caret"></span><span class="ui-button-text">&nbsp;</span></label></span>')
-        .click(function() {
-          // close if already visible
-          if (input.autocomplete("widget").is(":visible")) {
-            input.autocomplete("close");
-            return;
-          }
-
-          // pass empty string as value to search for, displaying all results
-          input.autocomplete("search", "");
-          input.focus();
-        });
-
-      filtering_select.append(input).append(button).insertAfter(select);
 
+      this._setOptionsSource();
+      this._initAutocomplete();
+      this._initKeyEvent();
+      this._overloadRenderItem();
+      this._autocompleteDropdownEvent(this.button);
 
+      return filtering_select.append(this.input)
+        .append(this.button)
+        .insertAfter(this.element);
     },
 
     _getResultSet: function(request, data, xhr) {
-      var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
-      var highlighter = function(label, word){
-        if(word.length > 0){
-          return $.map(label.split(word), function(el, i){
-            return $('<span></span>').text(el).html();
-          }).join($('<strong></strong>').text(word)[0].outerHTML);
-        }else{
-          return $('<span></span>').text(label).html();
-        }
+      var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), 'i');
+
+      var spannedContent = function(content) {
+        return $('<span>').text(content).html();
       };
 
-      return $.map(data, function(el, i) {
-        // match regexp only for local requests, remote ones are already filtered, and label may not contain filtered term.
-        if ((el.id || el.value) && (xhr || matcher.test(el.label))) {
-          return {
-            html: highlighter(el.label || el.id, request.term),
-            value: el.label || el.id,
-            id: el.id || el.value
-          };
+      var highlighter = function(label, word) {
+        if(word.length) {
+          return $.map(
+            label.split(word),
+            function(el) {
+              return spannedContent(el);
+            })
+            .join($('<strong>')
+            .text(word)[0]
+            .outerHTML
+          );
+        } else {
+          return spannedContent(label);
         }
+      };
+
+      return $.map(
+        data,
+        function(el) {
+          var id = el.id || el.value;
+          var value = el.label || el.id;
+          // match regexp only for local requests, remote ones are already
+          // filtered, and label may not contain filtered term.
+          if (id && (xhr || matcher.test(el.label))) {
+            return {
+              html: highlighter(value, request.term),
+              value: value,
+              id: id
+            };
+          }
       });
     },
 
     _getSourceFunction: function(source) {
-
-      var self = this,
-          requestIndex = 0;
+      var self = this;
+      var requestIndex = 0;
 
       if ($.isArray(source)) {
-
         return function(request, response) {
           response(self._getResultSet(request, source, false));
         };
-
-      } else if (typeof source === "string") {
-
+      } else if (typeof source === 'string') {
         return function(request, response) {
-
           if (this.xhr) {
             this.xhr.abort();
           }
@@ -162,7 +119,7 @@
           this.xhr = $.ajax({
             url: source,
             data: self.options.createQuery(request.term),
-            dataType: "json",
+            dataType: 'json',
             autocompleteRequest: ++requestIndex,
             success: function(data, status) {
               if (this.autocompleteRequest === requestIndex) {
@@ -176,11 +133,149 @@
             }
           });
         };
+      } else {
+        return source;
+      }
+    },
 
+    _setOptionsSource: function() {
+      if (this.options.xhr) {
+        this.options.source = this.options.remote_source;
       } else {
+        this.options.source = this.element.children('option').map(function() {
+          return { label: $(this).text(), value: this.value };
+        }).toArray();
+      }
+    },
 
-        return source;
+    _buttonField: function() {
+      return $(
+        '<span class="input-group-btn">' +
+          '<label class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="Show All Items" role="button">' +
+            '<span class="caret"></span>' +
+            '<span class="ui-button-text">&nbsp;</span>' +
+          '</label>' +
+        '</span>'
+      );
+    },
+
+    _autocompleteDropdownEvent: function(element) {
+      var self = this;
+
+      return element.click(function() {
+        // close if already visible
+        if (self.input.autocomplete('widget').is(':visible')) {
+          self.input.autocomplete('close');
+          return;
+        }
+
+        // pass empty string as value to search for, displaying all results
+        self.input.autocomplete('search', '');
+        self.input.focus();
+      });
+    },
+
+    _inputField: function() {
+      var input;
+      var selected = this.element.children(':selected');
+      var value = selected.val() ? selected.text() : '';
+
+      input = $('<input type="text">')
+        .val(value)
+        .addClass('form-control ra-filtering-select-input')
+        .attr('style', this.element.attr('style'))
+        .show();
+
+      if (this.element.attr('placeholder')) {
+        input.attr('placeholder', this.element.attr('placeholder'));
       }
+
+      return input;
+    },
+
+    _inputGroup: function(inputFor) {
+      return $('<div>')
+        .addClass('input-group filtering-select col-sm-2')
+        .attr('data-input-for', inputFor)
+        .css('float', 'left');
+    },
+
+    _initAutocomplete: function() {
+      var self = this;
+
+      return this.input.autocomplete({
+        delay: this.options.searchDelay,
+        minLength: this.options.minLength,
+        source: this._getSourceFunction(this.options.source),
+        select: function(event, ui) {
+          var option = $('<option>')
+            .attr('value', ui.item.id)
+            .attr('selected', 'selected')
+            .text(ui.item.value);
+          self.element.html(option)
+            .trigger('change', ui.item.id);
+          self._trigger('selected', event, {
+            item: option
+          });
+          $(self.element.parents('.controls')[0])
+            .find('.update')
+            .removeClass('disabled');
+        },
+        change: function(event, ui) {
+          if (ui.item) {
+            return;
+          }
+
+          var matcher = new RegExp('^' + $.ui.autocomplete.escapeRegex($(this).val()) + '$', 'i');
+          var valid = false;
+
+          self.element.children('option')
+            .each(function() {
+              if ($(this).text().match(matcher)) {
+                valid = true;
+                return false;
+              }
+            });
+
+          if (valid || $(this).val() !== '') {
+            return;
+          }
+
+          // remove invalid value, as it didn't match anything
+          $(this).val(null);
+          self.element.html($('<option value="" selected="selected"></option>'));
+          self.input.data('ui-autocomplete').term = '';
+          $(self.element.parents('.controls')[0])
+            .find('.update')
+            .addClass('disabled');
+          return false;
+        }
+      });
+    },
+
+    _initKeyEvent: function() {
+      var self = this;
+
+      return this.input.keyup(function() {
+        if ($(this).val().length) {
+          return;
+        }
+
+        /* Clear select options and trigger change if selected item is deleted */
+        return self.element
+          .html($('<option value="" selected="selected"></option>'))
+          .trigger('change');
+      });
+    },
+
+    _overloadRenderItem: function() {
+      this.input.data('ui-autocomplete')._renderItem = function(ul, item) {
+        return $('<li></li>')
+          .data('ui-autocomplete-item', item)
+          .append($('<a></a>')
+          .html(item.html || item.id))
+          .appendTo(ul);
+      };
     },
 
     destroy: function() {