refinerycms-page-images 2.0.1 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d734dccd4a97c7c04d9752e6cfd85cb2b6266997
+  data.tar.gz: beeee224e8b42b0425e26a3e3e8a49c09aba4e3e
+SHA512:
+  metadata.gz: 515f2c187884f0a6157d5a05fdadf9f2a88c83b77216cafb8091fab7eceb090e12a3f1402c2e56e0eb8ad270ab321c70f8b7af1fd0e399dedf282e1deac74819
+  data.tar.gz: 3a35eaefb138d3104354a442ac6df63c5313a46ba56ec7fc981edf9c9a0e9552daf35a8bf302fa056a5b95852fd527894b5f964c0b6dded04c5f508415952864

data/.travis.yml

@@ -1,16 +1,27 @@
+language: ruby
+bundler_args: --without development
 before_script:
-  - "bundle exec rake refinery:testing:dummy_app > /dev/null"
-script: "bundle exec rspec ./spec"
+  - "sh -e /etc/init.d/xvfb start"
+  - "bundle exec rake refinery:testing:dummy_app"
+script:
+  - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
-  email:
-    - parndt@gmail.com
-    - ugis.ozolss@gmail.com
+  email: true
+  irc:
+    use_notice: true
+    skip_join: true
+    channels:
+      - "irc.freenode.org#refinerycms"
+  campfire:
+    on_success: always
+    on_failure: always
+    rooms:
+      - secure: "X5X39BTgXacSdc32F8mIjJKPqm5dZzmgZfJ14qYpJeMETTdA5JfByt2uCfU8\njJkkxT+XGWta0bSSlRIHQJO6pK26U94A95VYDX0jNuneKEnsoAsqJ6U0VY6v\nH5oxXMAZ2perP/FH9ZsPNR+ulyFfbMQCeGPJw5AXKZQqzf6qPOI="
 env:
   - DB=postgresql
   - DB=mysql
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 2.0.0
   - 1.9.3
-  - rbx
-  - jruby
+  - rbx-19mode
+  - jruby-19mode

data/Gemfile

@@ -2,62 +2,30 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.1'
+gem 'refinerycms', '~> 2.1.0'
+gem 'refinerycms-testing', '~> 2.1.0', :group => :test
 
-group :development, :test do
-  gem 'refinerycms-testing', '~> 2.0.0'
+# Database Configuration
+unless ENV['TRAVIS']
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  gem 'sqlite3', :platform => :ruby
 end
 
-group :development, :test do
-  require 'rbconfig'
-
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'jruby-openssl'
-  end
-
-  unless defined?(JRUBY_VERSION)
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-  end
-
-  platforms :mswin, :mingw do
-    gem 'win32console'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+  gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+  gem 'jdbc-mysql', '= 5.1.13', :platform => :jruby
+  gem 'mysql2', :platform => :ruby
+end
 
-  platforms :ruby do
-    gem 'spork', '0.9.0.rc9'
-    gem 'guard-spork'
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+  gem 'pg', :platform => :ruby
+end
 
-    unless ENV['TRAVIS']
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'growl',      '~> 1.0.3'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-        gem 'therubyracer', '~> 0.9.9'
-      end
-    end
-  end
+gem 'jruby-openssl', :platform => :jruby
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'growl',      '~> 1.0.3'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-      end
-    end
-  end
+group :test do
+  gem 'poltergeist'
 end
 
 # Refinery/rails should pull in the proper versions of these
@@ -67,4 +35,7 @@ group :assets do
   gem 'uglifier'
 end
 
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+  eval File.read(local_gemfile)
+end

data/Rakefile

@@ -17,3 +17,5 @@ Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/assets/javascripts/refinery/page-image-picker.js.erb

@@ -1,167 +1,190 @@
-$(document).ready(function(){
-  $('#custom_images_tab a').click(function(){
-    if (!(picker = $('#page_image_picker')).data('size-applied')){
-      wym_box = $('.page_part:first .wym_box');
-      iframe = $('.page_part:first iframe');
-      picker.css({
-        height: wym_box.height()
-        , width: wym_box.width()
-      }).data('size-applied', true).corner('tr 5px').corner('bottom 5px').find('.wym_box').css({
-        backgroundColor: 'white'
-        , height: iframe.height() + $('.page_part:first .wym_area_top').height() - parseInt($('.wym_area_top .label_inline_with_link a').css('lineHeight'))
-        , width: iframe.width() - 20
-        , 'border-color': iframe.css('border-top-color')
-        , 'border-style': iframe.css('border-top-style')
-        , 'border-width': iframe.css('border-top-width')
-        , padding: '0px 10px 0px 10px'
-      });
-    }
-  });
+<%# encoding: utf-8 %>
+var image_added; // Global callback
+(function($) {
+  var reset_functionality, open_image_caption, reindex_images,
+      template_li, wysiwyg_enabled, input_type;
+  $(document).ready(function(){
+    var picker = $('#page_image_picker');
+    input_type = picker.data('input-type');
+    wysiwyg_enabled = input_type == 'wym';
+
+    $('#custom_images_tab a').click(function(){
+      if (!picker.data('size-applied') && wysiwyg_enabled){
+        var wym_box = $('.page_part:first .wym_box'),
+            iframe = $('.page_part:first iframe');
+        picker.css({
+          height: wym_box.height()
+          , width: wym_box.width()
+        }).data('size-applied', true).corner('tr 5px').corner('bottom 5px').find('.wym_box').css({
+          backgroundColor: 'white'
+          , height: iframe.height() + $('.page_part:first .wym_area_top').height() - parseInt($('.wym_area_top .label_inline_with_link a').css('lineHeight'))
+          , width: iframe.width() - 20
+          , 'border-color': iframe.css('border-top-color')
+          , 'border-style': iframe.css('border-top-style')
+          , 'border-width': iframe.css('border-top-width')
+          , padding: '0px 10px 0px 10px'
+        });
+      }
+    });
 
-  // Webkit browsers don't like the textarea being moved around the DOM,
-  // they ignore the new contents. This is fixed below by adding a hidden
-  // field that stays in place.
-  $('#content #page_images li textarea:hidden').each(function(index) {
-    var old_name = $(this).attr('name');
-    $(this).attr('data-old-id', $(this).attr('id'));
-    $(this).attr('name', 'ignore_me_' + index);
-    $(this).attr('id', 'ignore_me_' + index);
-
-    var hidden = $('<input>')
-                  .addClass('caption')
-                  .attr('type', 'hidden')
-                  .attr('name', old_name)
-                  .attr('id', $(this).attr('data-old-id'))
-                  .val($(this).val());
-
-    $(this).parents('li').first().append(hidden);
-  });
+    // Webkit browsers don't like the textarea being moved around the DOM,
+    // they ignore the new contents. This is fixed below by adding a hidden
+    // field that stays in place.
+    $('#page_images li textarea:hidden').each(function(index) {
+      var old_name = $(this).attr('name'),
+          $this = $(this);
+      $this.attr('data-old-id', $this.attr('id'));
+      $this.attr('name', 'ignore_me_' + index);
+      $this.attr('id', 'ignore_me_' + index);
+
+      var hidden = $('<input>')
+                    .addClass('caption')
+                    .attr('type', 'hidden')
+                    .attr('name', old_name)
+                    .attr('id', $this.attr('data-old-id'))
+                    .val($this.val());
+
+      $this.parents('li').first().append(hidden);
+    });
 
-  reset_functionality();
-});
+    reset_functionality();
 
-reset_functionality = function() {
-  WYMeditor.onload_functions.push(function(){
-    $('.wym_box').css({'width':null});
-  });
 
-  $("#page_images").sortable({
-    'tolerance': 'pointer'
-    , 'placeholder': 'placeholder'
-    , 'cursor': 'drag'
-    , 'items': 'li'
-    , stop: reindex_images
+    // Once the plugin has init'd everything, remove the template UI
+    $('.page-images-caption-modal').hide();
+    template_li = $('#page_images .js-page-images-template').detach();
   });
 
-  $('#content #page_images li:not(.empty)').live('hover', function(e) {
-    if (e.type == 'mouseenter' || e.type == 'mouseover') {
-      if ((image_actions = $(this).find('.image_actions')).length == 0) {
-        image_actions = $("<div class='image_actions'></div>");
-        img_delete = $("<img src='/assets/refinery/icons/delete.png' width='16' height='16' />");
-        img_delete.appendTo(image_actions);
-        img_delete.click(function() {
-          $(this).parents('li').first().remove();
-          reindex_images();
-        });
+  reset_functionality = function() {
+    if(wysiwyg_enabled) {
+      WYMeditor.onload_functions.push(function(){
+        $('.wym_box').css({'width':null});
+      });
+    }
+
+    $("#page_images").sortable({
+      'tolerance': 'pointer'
+      , 'placeholder': 'placeholder'
+      , 'cursor': 'drag'
+      , 'items': 'li'
+      , stop: reindex_images
+    });
 
-        if ($(this).find('textarea.page_caption').length > 0) {
-          img_caption = $("<img src='/assets/refinery/icons/user_comment.png' width='16' height='16' class='caption' />");
-          img_caption.appendTo(image_actions);
-          img_caption.click(open_image_caption);
-        } else {
-          image_actions.addClass('no_captions');
+    $('#page_images').on('mouseenter mouseleave', 'li', function(e) {
+      var $this = $(this),
+          image_actions = $this.find('.image_actions');
+      if (e.type == 'mouseenter') {
+        if (image_actions.length == 0) {
+          image_actions = $("<div class='image_actions'></div>");
+          var img_delete = $("<img src='<%= image_path('refinery/icons/delete.png') %>' width='16' height='16' />");
+          img_delete.appendTo(image_actions);
+          img_delete.click(function() {
+            $(this).parents('li').first().remove();
+            reindex_images();
+          });
+
+          if ($this.find('textarea.page_caption').length > 0) {
+            var img_caption = $("<img src='<%= image_path('refinery/icons/user_comment.png') %>' width='16' height='16' class='caption' />");
+            img_caption.appendTo(image_actions);
+            img_caption.click(open_image_caption);
+          } else {
+            image_actions.addClass('no_captions');
+          }
+
+          image_actions.appendTo($this);
         }
 
-        image_actions.appendTo($(this));
+        image_actions.show();
+      } else if (e.type == 'mouseleave') {
+        image_actions.hide();
       }
+    });
+
+    reindex_images();
+  };
+
+  image_added = function(image) {
+    var current_list_item = template_li.clone(),
+        image_id = $(image).attr('id').replace('image_', '');
+    current_list_item.find('input:hidden:first').val(image_id);
+
+    $("<img />").attr({
+      title: $(image).attr('title')
+      , alt: $(image).attr('alt')
+      , src: $(image).attr('data-grid') // use 'grid' size that is built into Refinery CMS (135x135#c).
+    }).appendTo(current_list_item);
+
+    current_list_item.attr('id', 'image_' + image_id).removeClass('empty');
+
+    current_list_item.appendTo($('#page_images'));
+    reset_functionality();
+  };
+
+  open_image_caption = function(e) {
+    var list_item = $(this).closest('li'),
+        textarea = list_item.find('.page-images-caption-modal > textarea'),
+        textarea_wrapper = textarea.parent(),
+        modal_size = {
+          textarea: { width: 400, height: 'auto' },
+          wym: { width: 928, height: 530 }
+        };
+
+    textarea_wrapper.find('.js-page-images-done').on('click', function() {
+      textarea_wrapper.dialog("close");
+    });
+
+    var close_handler = function() {
+      if(wysiwyg_enabled) {
+        textarea.data('wymeditor').update();
+      }
+
+      $('li.current_caption_list_item').removeClass('current_caption_list_item');
+      $('#' + textarea.attr('data-old-id')).val(textarea.val());
+      textarea_wrapper.dialog('destroy');
+    };
+
+    // move the textarea out of the list item, and then move the textarea back into it when we click done.
+    list_item.addClass('current_caption_list_item');
+    textarea_wrapper.dialog({
+      title: "<%= I18n.t('refinery.js.admin.page_images.add_caption') %>"
+      , modal: true
+      , resizable: false
+      , autoOpen: true
+      , width: modal_size[input_type].width
+      , height: modal_size[input_type].height
+      , close: close_handler
+    });
 
-      image_actions.show();
-    } else if (e.type == 'mouseleave' || e.type == 'mouseout') {
-      $(this).find('.image_actions').hide();
+    if(wysiwyg_enabled) {
+      textarea.addClass('wymeditor active_rotator_wymeditor widest').wymeditor(wymeditor_boot_options);
     }
-  });
+    else {
+      textarea.show();
+    }
+  };
 
-  reindex_images();
-}
-
-image_added = function(image) {
-  new_list_item = (current_list_item = $('li.empty')).clone();
-  image_id = $(image).attr('id').replace('image_', '');
-  current_list_item.find('input:hidden:first').val(image_id);
-
-  $("<img />").attr({
-    title: $(image).attr('title')
-    , alt: $(image).attr('alt')
-    , src: $(image).attr('data-grid') // use 'grid' size that is built into Refinery CMS (135x135#c).
-  }).appendTo(current_list_item);
-
-  current_list_item.attr('id', 'image_' + image_id).removeClass('empty');
-
-  new_list_item.appendTo($('#page_images'));
-  reset_functionality();
-}
-
-open_image_caption = function(e) {
-  // move the textarea out of the list item, and then move the textarea back into it when we click done.
-  (list_item = $(this).parents('li').first()).addClass('current_caption_list_item');
-  textarea = list_item.find('.textarea_wrapper_for_wym > textarea');
-
-  textarea.after($("<div class='form-actions'><div class='form-actions-left'><a class='button'><%= I18n.t('refinery.js.admin.page_images.done') %></a></div></div>"));
-  textarea.parent().dialog({
-     title: "<%= I18n.t('refinery.js.admin.page_images.add_caption') %>"
-     , modal: true
-     , resizable: false
-     , autoOpen: true
-     , width: 928
-     , height: 530
-   });
-
-  $('.ui-dialog:visible .ui-dialog-titlebar-close, .ui-dialog:visible .form-actions a.button')
-    .on('click',
-      $.proxy(function(e) {
-        // first, update the editor because we're blocking event bubbling (third argument to bind set to false).
-        $(this).data('wymeditor').update();
-        $(this).removeClass('wymeditor')
-               .removeClass('active_rotator_wymeditor');
-
-        $this_parent = $(this).parent();
-        $this_parent.appendTo('li.current_caption_list_item').dialog('close').data('dialog', null);
-        $this_parent.find('.form-actions').remove();
-        $this_parent.find('.wym_box').remove();
-        $this_parent.css('height', 'auto');
-        $this_parent.removeClass('ui-dialog-content').removeClass('ui-widget-content');
-
-        $('li.current_caption_list_item').removeClass('current_caption_list_item');
-
-        $('.ui-dialog, .ui-widget-overlay:visible').remove();
-
-        $('#' + $(this).attr('data-old-id')).val($(this).val());
-      }, textarea)
-    );
-
-  textarea.addClass('wymeditor active_rotator_wymeditor widest').wymeditor(wymeditor_boot_options);
-}
-
-reindex_images = function() {
-  $('#page_images li textarea:hidden').each(function(i, input){
-    // make the image's name consistent with its position.
-    parts = $(input).attr('name').split('_');
-    parts[2] = ('' + i);
-    $(input).attr('name', parts.join('_'));
-
-    // make the image's id consistent with its position.
-    $(input).attr('id', $(input).attr('id').replace(/_\d/, '_' + i));
-    $(input).attr('data-old-id', $(input).attr('data-old-id').replace(/_\d_/, '_'+i+'_').replace(/_\d/, '_' + i));
-  });
-  $('#page_images li').each(function(i, li){
-    $('input:hidden', li).each(function() {
+  reindex_images = function() {
+    $('#page_images li textarea:hidden').each(function(i, input){
       // make the image's name consistent with its position.
-      parts = $(this).attr('name').split(']');
-      parts[1] = ('[' + i);
-      $(this).attr('name', parts.join(']'));
+      var parts = $(input).attr('name').split('_');
+      parts[2] = ('' + i);
+      $(input).attr('name', parts.join('_'));
 
       // make the image's id consistent with its position.
-      $(this).attr('id', $(this).attr('id').replace(/_\d_/, '_'+i+'_').replace(/_\d/, '_'+i));
+      $(input).attr('id', $(input).attr('id').replace(/_\d/, '_' + i));
+      $(input).attr('data-old-id', $(input).attr('data-old-id').replace(/_\d_/, '_'+i+'_').replace(/_\d/, '_' + i));
     });
-  });
-}
+    $('#page_images li').each(function(i, li){
+      $('input:hidden', li).each(function() {
+        var $this = $(this);
+        // make the image's name consistent with its position.
+        var parts = $this.attr('name').split(']');
+        parts[1] = ('[' + i);
+        $this.attr('name', parts.join(']'));
+
+        // make the image's id consistent with its position.
+        $this.attr('id', $this.attr('id').replace(/_\d_/, '_'+i+'_').replace(/_\d/, '_'+i));
+      });
+    });
+  }
+})(jQuery);