rich_cms 3.0.0 → 3.0.1

data/CHANGELOG.rdoc

@@ -1,5 +1,14 @@
 = Rich-CMS CHANGELOG
 
+== Version 3.0.1 (April 6, 2011)
+
+* Bugfix: Corrected contains operator into equals within Rich.Cms.afterUpdate function. Thanks Chris Obdam (@chrisobdam) for contributing
+* Bugfix: Fixed logging into Rich-CMS when using Devise > 1.1.5
+* Using RaccoonTip v1.0.9 (which includes bugfix regarding Chrome and inputs)
+* Bugfix: always rendering passed HTML attributes with CMS items (it was only when logged in as admin at first). Thanks Jeroen Bulters (@bulters) for contributing
+* Allow no wrapping tag in cases when no user is logged in (essential in case the extra 'span' will bork the layout). Thanks Jeroen Bulters (@bulters) for contributing
+* Bugfix: setting the data-value attribute after editing content
+
 == Version 3.0.0 (February 7, 2011)
 
 * Refactored the authentication code. Being able to run Rich-CMS with:

data/README.textile

@@ -6,6 +6,7 @@ A Rails gem (and also plugin) for a pluggable CMS frontend
 h2. Introduction
 
 Rich-CMS is a module of E9s ("http://github.com/archan937/e9s":http://github.com/archan937/e9s) which provides a frontend for your CMS content.
+Please check out an online demo of Rich-CMS at the "Rich-CMS":http://codehero.es/rails_gems_plugins/rich_cms or "E9s":http://codehero.es/rails_gems_plugins/e9s page at "http://codehero.es":http://codehero.es.
 
 h2. Installation
 
@@ -229,7 +230,7 @@ When specifying a custom after update Javascript function, you probably want to
   end
 </pre>
 
-The JSON data provided will be look like:
+The JSON data provided will look like:
 
 <pre>
   {"__selector__": ".i18n", "__identifier__": {"locale": "nl", "key": "word.user"}, "value": "gebruiker", "translations": {"users": "gebruikers"}}
@@ -274,6 +275,8 @@ h2. Contributors
 
 Mark Mulder - "@bitterzoet":http://twitter.com/bitterzoet - "http://ikbenbitterzoet.com":http://ikbenbitterzoet.com
 Stephan Kaag - "@stephankaag":http://twitter.com/stephankaag - "http://hollandonrails.nl":http://hollandonrails.nl
+Jeroen Bulters – "@bulters":http://twitter.com/bulters – "http://bulte.rs":http://bulte.rs
+Chris Obdam - "@chrisobdam":http://twitter.com/chrisobdam - "http://holder.nl":http://holder.nl
 
 h2. ToDo's
 

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/assets/jzip/jquery/raccoon_tip.js

@@ -1,16 +1,16 @@
 if (typeof(RaccoonTip) == "undefined") {
 
 // *
-// * RaccoonTip 1.0.8 (Uncompressed)
+// * RaccoonTip 1.0.9 (Uncompressed)
 // * A lightweight jQuery based balloon tip library
 // *
 // * This library requires jQuery (http://jquery.com)
 // *
-// * (c) 2010 Paul Engel (Internetbureau Holder B.V.)
+// * (c) 2011 Paul Engel (Internetbureau Holder B.V.)
 // * Except otherwise noted, RaccoonTip is licensed under
 // * http://creativecommons.org/licenses/by-sa/3.0
 // *
-// * $Date: 2010-10-17 13:37:39 +0100 (Sun, 17 October 2010) $
+// * $Date: 2011-02-24 02:43:21 +0100 (Thu, 24 February 2011) $
 // *
 
 RaccoonTip = (function() {
@@ -18,7 +18,6 @@ RaccoonTip = (function() {
   var css  = '<style>#raccoon_tip{*padding:14px;position:absolute;z-index:9999}#raccoon_tip .rt_tip{width:0;font-size:0;line-height:0;position:absolute;filter:chroma(color=pink)}#raccoon_tip.rt_bottom_right{margin-left:-28px;padding-top:14px}#raccoon_tip.rt_bottom_right .rt_tip{top:0;left:14px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-right-width:14px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_bottom_middle{padding-top:14px}#raccoon_tip.rt_bottom_middle .rt_tip{top:0;left:50%;margin-left:-7px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-left-width:7px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink;border-right-width:7px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_bottom_left{margin-left:28px;padding-top:14px}#raccoon_tip.rt_bottom_left .rt_tip{top:0;right:14px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-left-width:14px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink}#raccoon_tip.rt_middle_left{margin-left:-7px;padding-right:14px}#raccoon_tip.rt_middle_left .rt_tip{top:50%;right:0;margin-top:-7px;border-left-width:14px;border-left-style:solid;border-left-color:#f9e98e;border-top-width:7px;border-top-style:solid;border-top-color:transparent;*border-top-color:pink;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:transparent;*border-bottom-color:pink}#raccoon_tip.rt_top_left{margin-left:28px;padding-bottom:14px}#raccoon_tip.rt_top_left .rt_tip{bottom:0;right:14px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-left-width:14px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink}#raccoon_tip.rt_top_middle{padding-bottom:14px}#raccoon_tip.rt_top_middle .rt_tip{bottom:0;left:50%;margin-left:-7px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-left-width:7px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink;border-right-width:7px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_top_right{margin-left:-28px;padding-bottom:14px}#raccoon_tip.rt_top_right .rt_tip{bottom:0;left:14px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-right-width:14px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_middle_right{margin-left:7px;padding-left:14px}#raccoon_tip.rt_middle_right .rt_tip{top:50%;left:0;margin-top:-7px;border-right-width:14px;border-right-style:solid;border-right-color:#f9e98e;border-top-width:7px;border-top-style:solid;border-top-color:transparent;*border-top-color:pink;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:transparent;*border-bottom-color:pink}#raccoon_tip .rt_content{padding:6px 12px 8px 12px;overflow:hidden;background:#fbf7aa;border-width:10px;border-style:solid;border-color:#f9e98e;*border-width:7px;border-radius:10px;-moz-border-radius:10px;-webkit-border-radius:10px;box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px;-moz-box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px;-webkit-box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px}#raccoon_tip .rt_content,#raccoon_tip .rt_content a{color:#a27d35;text-shadow:none}#raccoon_tip .rt_content a{outline:0}</style>';
 
   var default_options = {event: "click", duration: "fast", position: "bottom_right", beforeShow: function() {}, canHide: function() { return true; }, afterHide: function() {}}, opts = null;
-  var displaying = false, mouseover = false;
 
   var register = function(target, content, options) {
     var attachFunction = $.inArray(options.event || default_options.event, ["focus"]) == -1 ? "live" : "bind";
@@ -29,11 +28,9 @@ RaccoonTip = (function() {
   };
 
   var display = function(target, content, options) {
-    displaying = true;
     setup();
     deriveOptions(target, content, options);
     show();
-    displaying = false;
   };
 
   var close = function() {
@@ -42,8 +39,9 @@ RaccoonTip = (function() {
 
   var setup = function() {
     if (!$("#raccoon_tip").length) {
-      $("body").mouseup(function(event) {
-        if (!displaying && !mouseover && opts.canHide.apply()) {
+      $("body").mousedown(function(event) {
+        var target = $(event.target);
+        if (opts.canHide.apply() && target.closest("#raccoon_tip").length == 0) {
           hide();
         }
       });
@@ -51,7 +49,7 @@ RaccoonTip = (function() {
         $(document.body).before("<head></head>");
       }
       $(css).prependTo("head");
-      $(html).appendTo("body").find(".rt_content").mouseenter(function() { mouseover = true; }).mouseleave(function() { mouseover = false; });
+      $(html).appendTo("body");
     } else {
       hide();
     }
@@ -163,7 +161,7 @@ RaccoonTip = (function() {
   };
 
   return {
-    version: "1.0.8",
+    version: "1.0.9",
     init: function() {
       if (typeof(onRaccoonTipReady) == "function") {
         onRaccoonTipReady();

data/assets/jzip/rich/cms/editor.js

@@ -1,4 +1,3 @@
-
 Rich.Cms.Editor = (function() {
   var content_class        = "rich_cms_content", mark_class = "marked", edit_panel = "#rich_cms_panel",
       editable_content     = {}, content_items = "",
@@ -16,7 +15,7 @@ Rich.Cms.Editor = (function() {
       var toggler = $(event.target);
       toggler.hide().closest(".keys").find("select[name=" + toggler.attr("data-name") + "]").show();
     });
-    
+
     $("#rich_cms_panel .edit a.close").bind("click", function(event) {
       event.preventDefault();
       RaccoonTip.close();
@@ -107,15 +106,15 @@ Rich.Cms.Editor = (function() {
         } else if (specs.keys.indexOf(attr) != -1) {
           var available_keys = $.map(value.split(","), function(key) { return $.trim(key); });
           var default_key    = available_keys[0];
-          
+
           if (specs.keys.length > 1 && keys.find("select").length > 0) {
             keys.append("<span>, <span>");
           }
-          
+
           keys.append(available_keys.length == 1 ?
                         "<span>" + default_key + "<span>" :
                         "<a href='#' class='toggler' data-attr='" + attr + "' data-name='" + name + "'>" + default_key + "</a>");
-          keys.append("<select name='" + name + "' style='display: none'>" + 
+          keys.append("<select name='" + name + "' style='display: none'>" +
                          $.map(available_keys, function(key) { return "<option value='" + key + "'>" + key + "</option>"; }).join("") +
                       "</select>");
         } else {
@@ -123,7 +122,7 @@ Rich.Cms.Editor = (function() {
         }
       }
     });
-    
+
     $("#rich_cms_panel .edit form fieldset.inputs div.keys select").bind("blur", function(event) {
       var select  = $(event.target);
       var toggler = select.hide().closest(".keys").find(".toggler[data-name=" + select.attr("name") + "]").html(select.val()).show();
@@ -135,7 +134,7 @@ Rich.Cms.Editor = (function() {
           values.push(value);
         }
       });
-      
+
       content_item.attr(toggler.attr("data-attr"), values.join(", "));
     });
 
@@ -159,10 +158,11 @@ Rich.Cms.Editor = (function() {
   var afterUpdate = function(form, response) {
     var selector   = response["__selector__"];
     var specs      = editable_content[selector];
-    var identifier = $.map(specs.keys, function(key) { return "[" + key + "^=" + response["__identifier__"][key.replace(/^data-/, "")] + "]"; }).join("");
+    var identifier = $.map(specs.keys, function(key) { return "[" + key + "=" + response["__identifier__"][key.replace(/^data-/, "")] + "]"; }).join("");
 
     var defaultFunction = function(form, response, selector, specs, identifier) {
-      $(identifier).html(response[specs.value.replace(/^data-/, "")]);
+      var value = response[specs.value.replace(/^data-/, "")];
+      $(identifier).html(value).attr(specs.value, value);
       if (typeof(SeatHolder) != "undefined") {
         SeatHolder.rebind();
       }

data/lib/rich/cms/auth.rb

@@ -26,10 +26,9 @@ module Rich
           user_session = "#{klass.name}Session".constantize.new params[klass_symbol]
           user_session.save
         when :devise
-          case Devise::VERSION
-          when "1.0.8", "1.0.9"
+          if Devise::VERSION.to_f < 1.1
             warden.authenticate(:scope => klass_symbol)
-          when "1.1.5"
+          else
             begin
               sessions = Devise.mappings[klass_symbol].controllers[:sessions]
               Devise.mappings[klass_symbol].controllers[:sessions] = "rich/cms_sessions"

data/lib/rich/cms/content/item.rb

@@ -59,17 +59,24 @@ module Rich
               (options[:html] ||= {}).store :class, [class_name.to_s.gsub(/^\./, ""), options[:html].try(:fetch, :class, nil)].compact.join(" ")
             end
 
-            attrs << options[:html].collect{|k, v|      "#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ") if options[:html]
             attrs << data          .collect{|k, v| "data-#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ")
           end
 
+          attrs << options[:html].collect{|k, v|      "#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ") if options[:html]
+
           tag = options[:tag] || @group.tag || (%w(text html).include?(options[:as].to_s.downcase) ? :div : :span)
 
-          "<#{tag} #{attrs.join(" ")}>#{value.blank? ? default : value}</#{tag}>".html_safe
+          if options[:tag] == :none && !Auth.can_edit?(@object)
+            "#{value.blank? ? default : value}"
+          else
+            # Make default for editable
+            tag = :span if tag == :none
+            "<#{tag} #{attrs.join(" ")}>#{value.blank? ? default : value}</#{tag}>".html_safe
+          end
         end
 
       end
 
     end
   end
-end
+end

data/lib/rich/cms/version.rb

@@ -3,7 +3,7 @@ module Rich
     module VERSION
       MAJOR = 3
       MINOR = 0
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join(".")
     end

data/rich_cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_cms}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-04-06}
   s.description = %q{Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners.}
   s.email = %q{paul.engel@holder.nl}
   s.extra_rdoc_files = [
@@ -112,7 +112,6 @@ Gem::Specification.new do |s|
     "test/integrator.rb",
     "test/rails-2/dummy/.bundle/config",
     "test/rails-2/dummy/Gemfile",
-    "test/rails-2/dummy/Gemfile.lock",
     "test/rails-2/dummy/Rakefile",
     "test/rails-2/dummy/app/controllers/application_controller.rb",
     "test/rails-2/dummy/app/helpers/application_helper.rb",
@@ -165,7 +164,6 @@ Gem::Specification.new do |s|
     "test/rails-2/test_helper.rb",
     "test/rails-3/dummy/.bundle/config",
     "test/rails-3/dummy/Gemfile",
-    "test/rails-3/dummy/Gemfile.lock",
     "test/rails-3/dummy/Rakefile",
     "test/rails-3/dummy/app/controllers/application_controller.rb",
     "test/rails-3/dummy/app/helpers/application_helper.rb",
@@ -238,7 +236,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://codehero.es/rails_gems_plugins/rich_cms}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Enrichments (e9s) module for a pluggable CMS frontend}
   s.test_files = [
     "test/integrator.rb",

data/test/rails-2/dummy/public/javascripts/rich_cms.js

@@ -1293,7 +1293,7 @@ Rich.Cms.Editor = (function() {
       var toggler = $(event.target);
       toggler.hide().closest(".keys").find("select[name=" + toggler.attr("data-name") + "]").show();
     });
-    
+
     $("#rich_cms_panel .edit a.close").bind("click", function(event) {
       event.preventDefault();
       RaccoonTip.close();
@@ -1384,15 +1384,15 @@ Rich.Cms.Editor = (function() {
         } else if (specs.keys.indexOf(attr) != -1) {
           var available_keys = $.map(value.split(","), function(key) { return $.trim(key); });
           var default_key    = available_keys[0];
-          
+
           if (specs.keys.length > 1 && keys.find("select").length > 0) {
             keys.append("<span>, <span>");
           }
-          
+
           keys.append(available_keys.length == 1 ?
                         "<span>" + default_key + "<span>" :
                         "<a href='#' class='toggler' data-attr='" + attr + "' data-name='" + name + "'>" + default_key + "</a>");
-          keys.append("<select name='" + name + "' style='display: none'>" + 
+          keys.append("<select name='" + name + "' style='display: none'>" +
                          $.map(available_keys, function(key) { return "<option value='" + key + "'>" + key + "</option>"; }).join("") +
                       "</select>");
         } else {
@@ -1400,7 +1400,7 @@ Rich.Cms.Editor = (function() {
         }
       }
     });
-    
+
     $("#rich_cms_panel .edit form fieldset.inputs div.keys select").bind("blur", function(event) {
       var select  = $(event.target);
       var toggler = select.hide().closest(".keys").find(".toggler[data-name=" + select.attr("name") + "]").html(select.val()).show();
@@ -1412,7 +1412,7 @@ Rich.Cms.Editor = (function() {
           values.push(value);
         }
       });
-      
+
       content_item.attr(toggler.attr("data-attr"), values.join(", "));
     });
 
@@ -1439,7 +1439,8 @@ Rich.Cms.Editor = (function() {
     var identifier = $.map(specs.keys, function(key) { return "[" + key + "^=" + response["__identifier__"][key.replace(/^data-/, "")] + "]"; }).join("");
 
     var defaultFunction = function(form, response, selector, specs, identifier) {
-      $(identifier).html(response[specs.value.replace(/^data-/, "")]);
+      var value = response[specs.value.replace(/^data-/, "")];
+      $(identifier).html(value).attr(specs.value, value);
       if (typeof(SeatHolder) != "undefined") {
         SeatHolder.rebind();
       }

data/test/rails-3/dummy/public/javascripts/rich_cms.js

@@ -1293,7 +1293,7 @@ Rich.Cms.Editor = (function() {
       var toggler = $(event.target);
       toggler.hide().closest(".keys").find("select[name=" + toggler.attr("data-name") + "]").show();
     });
-    
+
     $("#rich_cms_panel .edit a.close").bind("click", function(event) {
       event.preventDefault();
       RaccoonTip.close();
@@ -1384,15 +1384,15 @@ Rich.Cms.Editor = (function() {
         } else if (specs.keys.indexOf(attr) != -1) {
           var available_keys = $.map(value.split(","), function(key) { return $.trim(key); });
           var default_key    = available_keys[0];
-          
+
           if (specs.keys.length > 1 && keys.find("select").length > 0) {
             keys.append("<span>, <span>");
           }
-          
+
           keys.append(available_keys.length == 1 ?
                         "<span>" + default_key + "<span>" :
                         "<a href='#' class='toggler' data-attr='" + attr + "' data-name='" + name + "'>" + default_key + "</a>");
-          keys.append("<select name='" + name + "' style='display: none'>" + 
+          keys.append("<select name='" + name + "' style='display: none'>" +
                          $.map(available_keys, function(key) { return "<option value='" + key + "'>" + key + "</option>"; }).join("") +
                       "</select>");
         } else {
@@ -1400,7 +1400,7 @@ Rich.Cms.Editor = (function() {
         }
       }
     });
-    
+
     $("#rich_cms_panel .edit form fieldset.inputs div.keys select").bind("blur", function(event) {
       var select  = $(event.target);
       var toggler = select.hide().closest(".keys").find(".toggler[data-name=" + select.attr("name") + "]").html(select.val()).show();
@@ -1412,7 +1412,7 @@ Rich.Cms.Editor = (function() {
           values.push(value);
         }
       });
-      
+
       content_item.attr(toggler.attr("data-attr"), values.join(", "));
     });
 
@@ -1439,7 +1439,8 @@ Rich.Cms.Editor = (function() {
     var identifier = $.map(specs.keys, function(key) { return "[" + key + "^=" + response["__identifier__"][key.replace(/^data-/, "")] + "]"; }).join("");
 
     var defaultFunction = function(form, response, selector, specs, identifier) {
-      $(identifier).html(response[specs.value.replace(/^data-/, "")]);
+      var value = response[specs.value.replace(/^data-/, "")];
+      $(identifier).html(value).attr(specs.value, value);
       if (typeof(SeatHolder) != "undefined") {
         SeatHolder.rebind();
       }
@@ -1542,16 +1543,16 @@ Rich.Cms.Menu = (function() {
 if (typeof(RaccoonTip) == "undefined") {
 
 // *
-// * RaccoonTip 1.0.8 (Uncompressed)
+// * RaccoonTip 1.0.9 (Uncompressed)
 // * A lightweight jQuery based balloon tip library
 // *
 // * This library requires jQuery (http://jquery.com)
 // *
-// * (c) 2010 Paul Engel (Internetbureau Holder B.V.)
+// * (c) 2011 Paul Engel (Internetbureau Holder B.V.)
 // * Except otherwise noted, RaccoonTip is licensed under
 // * http://creativecommons.org/licenses/by-sa/3.0
 // *
-// * $Date: 2010-10-17 13:37:39 +0100 (Sun, 17 October 2010) $
+// * $Date: 2011-02-24 02:43:21 +0100 (Thu, 24 February 2011) $
 // *
 
 RaccoonTip = (function() {
@@ -1559,7 +1560,6 @@ RaccoonTip = (function() {
   var css  = '<style>#raccoon_tip{*padding:14px;position:absolute;z-index:9999}#raccoon_tip .rt_tip{width:0;font-size:0;line-height:0;position:absolute;filter:chroma(color=pink)}#raccoon_tip.rt_bottom_right{margin-left:-28px;padding-top:14px}#raccoon_tip.rt_bottom_right .rt_tip{top:0;left:14px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-right-width:14px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_bottom_middle{padding-top:14px}#raccoon_tip.rt_bottom_middle .rt_tip{top:0;left:50%;margin-left:-7px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-left-width:7px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink;border-right-width:7px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_bottom_left{margin-left:28px;padding-top:14px}#raccoon_tip.rt_bottom_left .rt_tip{top:0;right:14px;border-bottom-width:14px;border-bottom-style:solid;border-bottom-color:#f9e98e;border-left-width:14px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink}#raccoon_tip.rt_middle_left{margin-left:-7px;padding-right:14px}#raccoon_tip.rt_middle_left .rt_tip{top:50%;right:0;margin-top:-7px;border-left-width:14px;border-left-style:solid;border-left-color:#f9e98e;border-top-width:7px;border-top-style:solid;border-top-color:transparent;*border-top-color:pink;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:transparent;*border-bottom-color:pink}#raccoon_tip.rt_top_left{margin-left:28px;padding-bottom:14px}#raccoon_tip.rt_top_left .rt_tip{bottom:0;right:14px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-left-width:14px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink}#raccoon_tip.rt_top_middle{padding-bottom:14px}#raccoon_tip.rt_top_middle .rt_tip{bottom:0;left:50%;margin-left:-7px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-left-width:7px;border-left-style:solid;border-left-color:transparent;*border-left-color:pink;border-right-width:7px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_top_right{margin-left:-28px;padding-bottom:14px}#raccoon_tip.rt_top_right .rt_tip{bottom:0;left:14px;border-top-width:14px;border-top-style:solid;border-top-color:#f9e98e;border-right-width:14px;border-right-style:solid;border-right-color:transparent;*border-right-color:pink}#raccoon_tip.rt_middle_right{margin-left:7px;padding-left:14px}#raccoon_tip.rt_middle_right .rt_tip{top:50%;left:0;margin-top:-7px;border-right-width:14px;border-right-style:solid;border-right-color:#f9e98e;border-top-width:7px;border-top-style:solid;border-top-color:transparent;*border-top-color:pink;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:transparent;*border-bottom-color:pink}#raccoon_tip .rt_content{padding:6px 12px 8px 12px;overflow:hidden;background:#fbf7aa;border-width:10px;border-style:solid;border-color:#f9e98e;*border-width:7px;border-radius:10px;-moz-border-radius:10px;-webkit-border-radius:10px;box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px;-moz-box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px;-webkit-box-shadow:rgba(0, 0, 0, 0.1) 0 1px 3px}#raccoon_tip .rt_content,#raccoon_tip .rt_content a{color:#a27d35;text-shadow:none}#raccoon_tip .rt_content a{outline:0}</style>';
 
   var default_options = {event: "click", duration: "fast", position: "bottom_right", beforeShow: function() {}, canHide: function() { return true; }, afterHide: function() {}}, opts = null;
-  var displaying = false, mouseover = false;
 
   var register = function(target, content, options) {
     var attachFunction = $.inArray(options.event || default_options.event, ["focus"]) == -1 ? "live" : "bind";
@@ -1570,11 +1570,9 @@ RaccoonTip = (function() {
   };
 
   var display = function(target, content, options) {
-    displaying = true;
     setup();
     deriveOptions(target, content, options);
     show();
-    displaying = false;
   };
 
   var close = function() {
@@ -1583,8 +1581,9 @@ RaccoonTip = (function() {
 
   var setup = function() {
     if (!$("#raccoon_tip").length) {
-      $("body").mouseup(function(event) {
-        if (!displaying && !mouseover && opts.canHide.apply()) {
+      $("body").mousedown(function(event) {
+        var target = $(event.target);
+        if (opts.canHide.apply() && target.closest("#raccoon_tip").length == 0) {
           hide();
         }
       });
@@ -1592,7 +1591,7 @@ RaccoonTip = (function() {
         $(document.body).before("<head></head>");
       }
       $(css).prependTo("head");
-      $(html).appendTo("body").find(".rt_content").mouseenter(function() { mouseover = true; }).mouseleave(function() { mouseover = false; });
+      $(html).appendTo("body");
     } else {
       hide();
     }
@@ -1704,7 +1703,7 @@ RaccoonTip = (function() {
   };
 
   return {
-    version: "1.0.8",
+    version: "1.0.9",
     init: function() {
       if (typeof(onRaccoonTipReady) == "function") {
         onRaccoonTipReady();

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_cms
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -155,7 +155,6 @@ files:
 - test/integrator.rb
 - test/rails-2/dummy/.bundle/config
 - test/rails-2/dummy/Gemfile
-- test/rails-2/dummy/Gemfile.lock
 - test/rails-2/dummy/Rakefile
 - test/rails-2/dummy/app/controllers/application_controller.rb
 - test/rails-2/dummy/app/helpers/application_helper.rb
@@ -208,7 +207,6 @@ files:
 - test/rails-2/test_helper.rb
 - test/rails-3/dummy/.bundle/config
 - test/rails-3/dummy/Gemfile
-- test/rails-3/dummy/Gemfile.lock
 - test/rails-3/dummy/Rakefile
 - test/rails-3/dummy/app/controllers/application_controller.rb
 - test/rails-3/dummy/app/helpers/application_helper.rb
@@ -308,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Enrichments (e9s) module for a pluggable CMS frontend

data/test/rails-2/dummy/Gemfile.lock

@@ -1,97 +0,0 @@
-PATH
-  remote: /Users/paulengel/Sites/enrichments/vendor/foo/rich_cms
-  specs:
-    rich_cms (3.0.0)
-      haml (~> 3.0.25)
-      jzip (~> 1.0.11)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.10)
-      actionpack (= 2.3.10)
-    actionpack (2.3.10)
-      activesupport (= 2.3.10)
-      rack (~> 1.1.0)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
-    authlogic (2.1.6)
-      activesupport
-    capybara (0.4.1.1)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.7)
-    childprocess (0.1.6)
-      ffi (~> 0.6.3)
-    configuration (1.2.0)
-    culerity (0.2.15)
-    devise (1.0.9)
-      warden (~> 0.10.3)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    git (1.2.5)
-    haml (3.0.25)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json_pure (1.5.1)
-    jzip (1.0.11)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    mime-types (1.16)
-    mocha (0.9.10)
-      rake
-    mysql2 (0.2.6)
-    nokogiri (1.4.4)
-    rack (1.1.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (2.3.10)
-      actionmailer (= 2.3.10)
-      actionpack (= 2.3.10)
-      activerecord (= 2.3.10)
-      activeresource (= 2.3.10)
-      activesupport (= 2.3.10)
-      rake (>= 0.8.3)
-    rake (0.8.7)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.1.2)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
-      json_pure
-      rubyzip
-    shoulda (2.11.3)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    warden (0.10.7)
-      rack (>= 1.0.0)
-    xpath (0.1.3)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  authlogic
-  capybara
-  devise (~> 1.0.9)
-  jeweler
-  launchy
-  mocha
-  mysql2
-  rails (= 2.3.10)
-  rich_cms!
-  shoulda
-  sqlite3-ruby

data/test/rails-3/dummy/Gemfile.lock

@@ -1,139 +0,0 @@
-PATH
-  remote: /Users/paulengel/Sites/enrichments/vendor/foo/rich_cms
-  specs:
-    rich_cms (3.0.0)
-      haml (~> 3.0.25)
-      jzip (~> 1.0.11)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.7)
-    authlogic (2.1.6)
-      activesupport
-    bcrypt-ruby (2.1.4)
-    builder (2.1.2)
-    capybara (0.4.1.1)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.7)
-    childprocess (0.1.6)
-      ffi (~> 0.6.3)
-    configuration (1.2.0)
-    culerity (0.2.15)
-    devise (1.1.5)
-      bcrypt-ruby (~> 2.1.2)
-      warden (~> 1.0.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    git (1.2.5)
-    haml (3.0.25)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json_pure (1.5.1)
-    jzip (1.0.11)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mocha (0.9.10)
-      rake
-    mysql2 (0.2.6)
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.1.2)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
-      json_pure
-      rubyzip
-    shoulda (2.11.3)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    warden (1.0.3)
-      rack (>= 1.0.0)
-    xpath (0.1.3)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  authlogic
-  capybara
-  devise (~> 1.1.5)
-  jeweler
-  launchy
-  mocha
-  mysql2
-  rails (= 3.0.3)
-  rich_cms!
-  shoulda
-  sqlite3-ruby