openskip-skip_embedded 0.9.3 → 0.9.4

data/ChangeLog

@@ -1,3 +1,6 @@
+== 0.9.4  / 2009-05-22
+* [new] update flash showing mechanism.
+
 == 0.9.3  / 2009-05-22
 * [new] 'skip_embedded_stylesheets' generator. extracted from main generator.
 * [new] client library for SKIP RP services(wiki, etc..).

data/Rakefile

@@ -60,7 +60,7 @@ spec = Gem::Specification.new do |s|
   s.require_path      = "lib"
   s.test_files        = Dir["spec/**/*_spec.rb"]
 
-  s.add_dependency "moro-repim", ">=0.1.4"
+  s.add_dependency "moro-repim", ">=0.1.7"
   s.add_dependency "json"
   s.add_dependency "oauth"
 

data/generators/skip_embedded/skip_embedded_generator.rb

@@ -11,6 +11,7 @@ class SkipEmbeddedGenerator < Rails::Generator::Base
         public/javascripts/dropdown_navigation.js
         public/javascripts/labeled_text_field.js
         public/javascripts/skip_fckeditor_config.js
+        public/javascripts/flash_message.js
       ]
 
       assets.map{|asset| File.dirname(asset) }.uniq.each{|asset| m.directory(asset) }

data/generators/skip_embedded/templates/app/views/layouts/skip_embedded.html.erb

@@ -35,8 +35,8 @@
     <% if SkipEmbedded::InitialSettings["skip_collaboration"]["fulltext_search"] -%>
       <%= render(:partial => "shared/skip_full_text_search_form") %>
     <% end -%>
-    <%=  render :partial=>"shared/flash_message" %>
   </div>
+  <%=  render :partial=>"shared/flash_message" %>
 
   <div id="main">
     <div id="tab_body">

data/generators/skip_embedded/templates/app/views/shared/_flash_message.html.erb

@@ -1,27 +1,16 @@
+
 <div id="flash_message">
-  <%= render_flash(:error) %>
-  <%= render_flash(:warn) %>
-  <%= render_flash(:notice) %>
+  <% %w[error warn notice].each do |klass| -%>
+    <% content_tag(:div, :class => klass, :style => "display:none") do -%>
+      <%= content_tag("h3", "&nbsp;")%>
+      <%= content_tag("span", _("[Click to hide]")) %>
+    <%end -%>
+  <% end -%>
 </div>
 
-<%- javascript_tag do %>
-  jQuery(document).ready(function(){
-    $("#flash_message div").click(function(){$('#ie-select-fix').remove(); $(this).fadeOut("slow")});
-    setTimeout(function(){ $("#flash_message div.notice").trigger("click"); }, 2*1000);
-    setTimeout(function(){ $("#flash_message div.warn").trigger("click"); }, 5*1000);
-
-    if(jQuery.browser.ie){
-      var flash =  jQuery("#flash_message");
-      var position = flash.position();
-
-      var iframe = jQuery("<iframe id='ie-select-fix' src='<%= request.relative_url_root + "/blank" %>'></iframe>").
-        css("z-index",  flash.css("z-index")).
-        css("width",  flash.width()).
-        css("height",  flash.height()).
-        css("top", position.top).
-        css("left", position.left);
-
-      flash.css("z-index", Number(iframe.css("z-index")) + 1).after(iframe);
-    };
-  });
+<%- content_for :javascript_initializer do %>
+  $("#flash_message").flashMessage(
+    <%= [:error, :warn, :notice].inject({}){|r, k| r.update(k => flash[k]) }.reject{|k,v|v.nil?}.to_json %>,
+    "<%= request.relative_url_root %>"
+  );
 <% end %>

data/generators/skip_embedded/templates/public/javascripts/flash_message.js

@@ -0,0 +1,39 @@
+jQuery.fn.flashMessage = function(flashes, relativeUrlRoot){
+  var flash = jQuery(this);
+  if(jQuery.browser.ie){
+    var position = flash.position();
+
+    var iframe = jQuery("<iframe id='ie-select-fix'></iframe>").
+      attr("src", relativeUrlRoot + "/blank").
+      css("z-index",  flash.css("z-index")).
+      css("width",  flash.width()).
+      css("height",  flash.height()).
+      css("top", position.top).
+      css("left", position.left);
+
+    flash.css("z-index", Number(iframe.css("z-index")) + 1).after(iframe);
+  };
+
+  flash.find(" > div").click(function(){
+    jQuery("#ie-select-fix").hide();
+    jQuery(this).fadeOut();
+  });
+
+  function showFlash(type, message, hideAfterSec){
+    jQuery("#ie-select-fix").show();
+    flash.find("div." + type).show().find("h3").text(message);
+    if(hideAfterSec){
+      setTimeout(function(){ flash.find("div." + type).trigger("click"); }, hideAfterSec * 1000);
+    };
+  };
+
+  flash.bind("error",  function(_,message){ showFlash("error", message) }).
+        bind("warn",   function(_,message){ showFlash("warn", message, 5) }).
+        bind("notice", function(_,message){ showFlash("notice", message, 2) });
+
+  jQuery.each(flashes, function(key,val){ flash.triggerHandler(key, val) });
+
+  return flash;
+};
+
+

data/lib/skip_embedded.rb

@@ -1,6 +1,6 @@
 # SkipEmbedded
 module SkipEmbedded
-  Version = "0.9.3"
+  Version = "0.9.4"
 
   Dependencies = {:jquery => "jquery-1.3.2.min.js"}
 end

data/lib/skip_embedded/helpers.rb

@@ -5,7 +5,7 @@ module SkipEmbedded
 
     def self.included(base)
       ActionView::Helpers::AssetTagHelper.register_javascript_expansion :jquery => [Dependencies[:jquery]]
-      ActionView::Helpers::AssetTagHelper.register_javascript_expansion :skip => %w[dropdown_navigation labeled_text_field]
+      ActionView::Helpers::AssetTagHelper.register_javascript_expansion :skip => %w[dropdown_navigation labeled_text_field flash_message]
       ActionView::Helpers::AssetTagHelper.register_javascript_expansion :skip_fckeditor => %w[fckeditor/fckeditor skip_fckeditor_config]
 
       # TODO skip/style などをどの程度共通化するかを検討、それはではskip_embeddedという別名で

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: openskip-skip_embedded
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - MAEDA Naoki
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.4
+        version: 0.1.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -101,6 +101,7 @@ files:
 - generators/skip_embedded/templates/public/blank.html
 - generators/skip_embedded/templates/public/javascripts
 - generators/skip_embedded/templates/public/javascripts/dropdown_navigation.js
+- generators/skip_embedded/templates/public/javascripts/flash_message.js
 - generators/skip_embedded/templates/public/javascripts/labeled_text_field.js
 - generators/skip_embedded/templates/public/javascripts/skip_fckeditor_config.js
 - generators/skip_embedded_stylesheets