active_admin_pro 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40da224f2c53a66c89d0bb2d287d2f2860cf7c66
-  data.tar.gz: d93c77773de0d7d57a0faf4ef1784c9e349ce85f
+  metadata.gz: 1ebfc0c84234ba5d727c8409f3a0e6b936b9a96b
+  data.tar.gz: b60b1ba8e7ffc83628f26544818fcb260d694e55
 SHA512:
-  metadata.gz: f210b81c192fd547de7e428f236eeed58d8fb43c36ef3f2e53f852af5414ce6046a6758cbd1767dfd54886ab42725b1cc9d8e0e6334f68acc8ebf581f1788ba9
-  data.tar.gz: ccf864b13be94639683ab75c319aeb7c60d02ff137d5f5b631aee17d895c5a35bc1aa3a212580ead095b954233aead5abb486e1048659780858359e46b399e56
+  metadata.gz: 9b7d82e2e40f13b3a8787842aa7fedb5e3eeef8361fc288701a30b26e8594671e96ce25fd47cc25d4d80d253b7778a6e3c69316b9b272450893c262379851770
+  data.tar.gz: 3ca8c3c20dd46838be4fbdba0afe4ea3797ca12323988f355889daafbfa7c5371a09b42cfb2d5a06eb740712b1029ac41eca28350761609168b7a1c4c2b55694

data/app/assets/javascripts/active_admin_pro/components/summernote_input.js

@@ -53,7 +53,6 @@
 
       // Override the default image dialog with an Active Admin (jQuery UI) dialog
       var pictureButton = wrapper.find('button[data-original-title="Picture"]');
-      pictureButton.unbind('click');
       pictureButton.click(function(event) {
         var dialogHtml = '<div id="summernote_image_dialog">';
         dialogHtml += '<div class="input file">';

data/config/initializers/active_admin.rb

@@ -9,7 +9,7 @@ ActiveAdmin.application.tap do |config|
   config.localize_format = :short
 
   # Include Font Awesome in ActiveAdmin
-  config.register_stylesheet "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css"
+  config.register_stylesheet "//maxcdn.bootstrapcdn.com/font-awesome/#{ENV['FONT_AWESOME_VERSION'] || '4.5.0'}/css/font-awesome.min.css"
 
   # Add Apple web application icons
   base_url = "//s3.amazonaws.com/codelation.activeadmin/apple-touch-icon"

data/lib/active_admin_pro/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminPro
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

data/vendor/assets/javascripts/summernote.js

@@ -5447,8 +5447,7 @@
       context.memo('button.picture', function () {
         return ui.button({
           contents: ui.icon(options.icons.picture),
-          tooltip: lang.image.image,
-          click: context.createInvokeHandler('imageDialog.show')
+          tooltip: lang.image.image
         }).render();
       });
 
@@ -5994,122 +5993,43 @@
     };
   };
 
-  var ImageDialog = function (context) {
-    var self = this;
+  var ImagePopover = function (context) {
     var ui = $.summernote.ui;
 
-    var $editor = context.layoutInfo.editor;
     var options = context.options;
-    var lang = options.langInfo;
-
-    this.initialize = function () {
-      var $container = options.dialogsInBody ? $(document.body) : $editor;
-
-      var imageLimitation = '';
-      if (options.maximumImageFileSize) {
-        var unit = Math.floor(Math.log(options.maximumImageFileSize) / Math.log(1024));
-        var readableSize = (options.maximumImageFileSize / Math.pow(1024, unit)).toFixed(2) * 1 +
-                           ' ' + ' KMGTP'[unit] + 'B';
-        imageLimitation = '<small>' + lang.image.maximumFileSize + ' : ' + readableSize + '</small>';
-      }
-
-      var body = '<div class="form-group note-group-select-from-files">' +
-                   '<label>' + lang.image.selectFromFiles + '</label>' +
-                   '<input class="note-image-input form-control" type="file" name="files" accept="image/*" multiple="multiple" />' +
-                   imageLimitation +
-                 '</div>' +
-                 '<div class="form-group" style="overflow:auto;">' +
-                   '<label>' + lang.image.url + '</label>' +
-                   '<input class="note-image-url form-control col-md-12" type="text" />' +
-                 '</div>';
-      var footer = '<button href="#" class="btn btn-primary note-image-btn disabled" disabled>' + lang.image.insert + '</button>';
 
-      this.$dialog = ui.dialog({
-        title: lang.image.insert,
-        fade: options.dialogsFade,
-        body: body,
-        footer: footer
-      }).render().appendTo($container);
+    this.shouldInitialize = function () {
+      return !list.isEmpty(options.popover.image);
     };
 
-    this.destroy = function () {
-      ui.hideDialog(this.$dialog);
-      this.$dialog.remove();
-    };
+    this.initialize = function () {
+      this.$popover = ui.popover({
+        className: 'note-image-popover'
+      }).render().appendTo('body');
+      var $content = this.$popover.find('.popover-content');
 
-    this.bindEnterKey = function ($input, $btn) {
-      $input.on('keypress', function (event) {
-        if (event.keyCode === key.code.ENTER) {
-          $btn.trigger('click');
-        }
-      });
+      context.invoke('buttons.build', $content, options.popover.image);
     };
 
-    this.show = function () {
-      context.invoke('editor.saveRange');
-      this.showImageDialog().then(function (data) {
-        // [workaround] hide dialog before restore range for IE range focus
-        ui.hideDialog(self.$dialog);
-        context.invoke('editor.restoreRange');
-
-        if (typeof data === 'string') { // image url
-          context.invoke('editor.insertImage', data);
-        } else { // array of files
-          context.invoke('editor.insertImagesOrCallback', data);
-        }
-      }).fail(function () {
-        context.invoke('editor.restoreRange');
-      });
+    this.destroy = function () {
+      this.$popover.remove();
     };
 
-    /**
-     * show image dialog
-     *
-     * @param {jQuery} $dialog
-     * @return {Promise}
-     */
-    this.showImageDialog = function () {
-      return $.Deferred(function (deferred) {
-        var $imageInput = self.$dialog.find('.note-image-input'),
-            $imageUrl = self.$dialog.find('.note-image-url'),
-            $imageBtn = self.$dialog.find('.note-image-btn');
-
-        ui.onDialogShown(self.$dialog, function () {
-          context.triggerEvent('dialog.shown');
-
-          // Cloning imageInput to clear element.
-          $imageInput.replaceWith($imageInput.clone()
-            .on('change', function () {
-              deferred.resolve(this.files || this.value);
-            })
-            .val('')
-          );
-
-          $imageBtn.click(function (event) {
-            event.preventDefault();
-
-            deferred.resolve($imageUrl.val());
-          });
-
-          $imageUrl.on('keyup paste', function () {
-            var url = $imageUrl.val();
-            ui.toggleBtn($imageBtn, url);
-          }).val('').trigger('focus');
-          self.bindEnterKey($imageUrl, $imageBtn);
-        });
-
-        ui.onDialogHidden(self.$dialog, function () {
-          $imageInput.off('change');
-          $imageUrl.off('keyup paste keypress');
-          $imageBtn.off('click');
-
-          if (deferred.state() === 'pending') {
-            deferred.reject();
-          }
+    this.update = function (target) {
+      if (dom.isImg(target)) {
+        var pos = dom.posFromPlaceholder(target);
+        this.$popover.css({
+          display: 'block',
+          left: pos.left,
+          top: pos.top
         });
+      } else {
+        this.hide();
+      }
+    };
 
-        ui.showDialog(self.$dialog);
-      });
+    this.hide = function () {
+      this.$popover.hide();
     };
   };
 
@@ -6687,8 +6607,7 @@
         'toolbar': Toolbar,
         'linkDialog': LinkDialog,
         'linkPopover': LinkPopover,
-        'imageDialog': ImageDialog,
-        // 'imagePopover': ImagePopover,
+        'imagePopover': ImagePopover,
         'videoDialog': VideoDialog,
         'helpDialog': HelpDialog,
         'airPopover': AirPopover

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_pro
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin