refinerycms-core 1.0.4 → 1.0.5

data/public/javascripts/refinery/admin.js

@@ -569,52 +569,37 @@ var link_dialog = {
   },
 
   web_tab: function(){
-    link_tester.validate_url_textbox("#web_address_text",  function() {
+    link_tester.validate_url_textbox("#web_address_text", function(){});
+
+    $('#web_address_text, #web_address_target_blank').change(function(){
       link_dialog.update_parent( $('#web_address_text').val(),
                                  $('#web_address_text').val(),
-                                 ($('#web_address_target_blank').get(0).checked ? "_blank" : "")
-                               );
-    });
-
-    $('#web_address_target_blank').click(function(){
-      parent.document.getElementById('wym_target').value = this.checked ? "_blank" : "";
+                                 $('#web_address_target_blank').get(0).checked ? "_blank" : ""
+      );
     });
   },
 
   email_tab: function() {
+    link_tester.validate_email_textbox("#email_address_text", function(){});
+
     $('#email_address_text, #email_default_subject_text, #email_default_body_text').change(function(e){
       var default_subject = $('#email_default_subject_text').val(),
           default_body = $('#email_default_body_text').val(),
           mailto = "mailto:" + $('#email_address_text').val(),
           modifier = "?",
-          icon = '';
-
-      $('#email_address_test_loader').show();
-      $('#email_address_test_result').hide();
-      $('#email_address_test_result').removeClass('success_icon').removeClass('failure_icon');
-
-
-      link_tester.email(mailto, function (success) {
-        if (success) {
-          icon = 'success_icon';
-        }else{
-          icon = 'failure_icon';
-        }
-        $('#email_address_test_result').addClass(icon).show();
-        $('#email_address_test_loader').hide();
-      });
+          additional = "";
 
       if(default_subject.length > 0){
-        mailto += modifier + "subject=" + default_subject;
+        additional += modifier + "subject=" + default_subject;
         modifier = "&";
       }
 
       if(default_body.length > 0){
-        mailto += modifier + "body=" + default_body;
+        additional += modifier + "body=" + default_body;
         modifier = "&";
       }
 
-      link_dialog.update_parent(mailto, mailto.replace('mailto:', ''));
+      link_dialog.update_parent(mailto + additional, mailto.replace('mailto:', ''));
     });
   },
 

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1781,10 +1781,16 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
   // focus first textarea or input type text element
   dialog.find('input[type=text], textarea').first().focus();
 
+  // init close_dialog when user clicks on cancel button
   doc.find('body').addClass('wym_iframe_body').find('#cancel_button').add(dialog.find('.close_dialog')).click(function(e){
     wym.close_dialog(e, true);
   });
 
+  // init close_dialog when user clicks on small x icon at the top of dialog
+  $('.ui-dialog-titlebar .ui-dialog-titlebar-close').click(function(e){
+    wym.close_dialog(e, true);
+  });
+
     //pre-init functions
   if($.isFunction(wym._options.preInitDialog)) {
     wym._options.preInitDialog(wym, window);

data/refinerycms-core.gemspec

@@ -3,10 +3,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{1.0.4}
+  s.version           = %q{1.0.5}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-08-11}
+  s.date              = %q{2011-08-31}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -15,16 +15,16 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '= 1.0.4'
-  s.add_dependency 'refinerycms-settings',        '= 1.0.4'
+  s.add_dependency 'refinerycms-base',            '= 1.0.5'
+  s.add_dependency 'refinerycms-settings',        '= 1.0.5'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '~> 0.1'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
-  s.add_dependency 'rails',                       '~> 3.0.9'
+  s.add_dependency 'rails',                       '~> 3.0.10'
   s.add_dependency 'truncate_html',               '~> 0.5'
-  s.add_dependency 'will_paginate',               '= 3.0.pre2'
+  s.add_dependency 'will_paginate',               '~> 3.0.0'
 
   s.files             = [
     'app',
@@ -164,7 +164,6 @@ Gem::Specification.new do |s|
     'lib/refinery/helpers/site_bar_helper.rb',
     'lib/refinery/helpers/tag_helper.rb',
     'lib/refinery/helpers/translation_helper.rb',
-    'lib/refinery/link_renderer.rb',
     'lib/refinery/menu.rb',
     'lib/refinery/menu_item.rb',
     'lib/refinery/plugin.rb',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Resolve Digital
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-base
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 5
+        version: 1.0.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 5
+        version: 1.0.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -137,12 +137,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 3
         - 0
-        - 9
-        version: 3.0.9
+        - 10
+        version: 3.0.10
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -166,15 +166,14 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1923831917
+        hash: 7
         segments: 
         - 3
         - 0
-        - pre
-        - 2
-        version: 3.0.pre2
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id010
 description: The core of Refinery CMS. This handles the common functionality and is required by most engines
@@ -292,7 +291,6 @@ files:
 - lib/refinery/helpers/site_bar_helper.rb
 - lib/refinery/helpers/tag_helper.rb
 - lib/refinery/helpers/translation_helper.rb
-- lib/refinery/link_renderer.rb
 - lib/refinery/menu.rb
 - lib/refinery/menu_item.rb
 - lib/refinery/plugin.rb
@@ -559,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Core engine for Refinery CMS

data/lib/refinery/link_renderer.rb

@@ -1,55 +0,0 @@
-class Refinery::LinkRenderer < WillPaginate::ViewHelpers::LinkRenderer
-
-# TODO: Rewrite for WillPaginate 3 API
-
-=begin
-
-  attr_accessor :url
-
-  def url_for(page)
-    # extract any url parameter and store it for subsequent requests but delete it
-    # this is so that we don't end up with it being an attribute of the resulting HTML.
-    @url ||= @options.delete(:url) || {}
-    page_one = page == 1
-    @url_params = {}
-    # page links should preserve GET parameters
-    stringified_merge @url_params, @template.params if @template.request.get?
-    stringified_merge @url_params, @options[:params] if @options[:params]
-
-    if complex = param_name.index(/[^\w-]/)
-      page_param = parse_query_parameters("#{param_name}=#{page}")
-
-      stringified_merge @url_params, page_param
-    else
-      @url_params[param_name] = page_one ? 1 : 2
-    end
-
-    url = @template.url_for(@url_params.merge!(@url).to_options)
-    return url if page_one
-
-    if complex
-      @url_string = url.sub(%r!((?:\?|&amp;)#{CGI.escape param_name}=)#{page}!, '\1@')
-      return url
-    else
-      @url_string = url
-      @url_params[param_name] = 3
-      @template.url_for(@url_params).split(//).each_with_index do |char, i|
-        if char == '3' and url[i, 1] == '2'
-          @url_string[i] = '@'
-          break
-        end
-      end
-    end
-    # finally!
-    @url_string.sub '@', page.to_s
-  end
-
-private
-
-  def param_name
-    @options[:param_name].to_s
-  end
-
-=end
-
-end