wysihat-engine 0.1.12 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/app/controllers/wysihat_files_controller.rb

@@ -3,19 +3,19 @@ class WysihatFilesController < ApplicationController
     @wysihat_file, @wysihat_files = WysihatFile.new, WysihatFile.all
     render :layout => false
   end
-  
+
   def create
-    @wysihat_file = WysihatFile.new(params[:wysihat_file])
-    
+    @wysihat_file = WysihatFile.new(:file => params[:wysihat_file][:file])
+
     responds_to_parent do
       render :update do |page|
         if(@wysihat_file.save)
-          page.insert_html :bottom, :wysihat_files, :partial => 'wysihat_file', :object => @wysihat_file  
+          page.insert_html :bottom, :wysihat_files, :partial => 'wysihat_file', :object => @wysihat_file
         end
-      end      
+      end
     end
   end
-  
+
   def destroy
     @wysihat_file = WysihatFile.find(params[:id])
     respond_to do |wants|

data/app/helpers/wysihat_files_helper.rb

@@ -1,13 +1,18 @@
 module WysihatFilesHelper
-  def include_link(file)
+  def include_link(file)    
     function = file.file_content_type.starts_with?('image') ?
       ".insertImage(this.href);" :
       ".insertHTML('<a href=\"' + this.href + '\">#{file.file_file_name}</a>');"
           
     link_to_function(
       file.file_file_name,
-      "$$('iframe##{params[:editor]}')[0]#{function}facebox.close();",
+      "$$('iframe##{editor_id}')[0]#{function}facebox.close();",
       :href => file.file.url
     )
   end
+  
+  def editor_id
+    return params[:wysihat_file][:editor] if params[:wysihat_file] && params[:wysihat_file][:editor]
+    params[:editor]
+  end
 end

data/app/views/wysihat_files/_form.html.erb

@@ -1,5 +1,7 @@
 <% form_for @wysihat_file, :html => { :multipart => true, :target => 'file_upload' } do |f| %>
-  
+
+	<%= f.hidden_field(:editor, :value => params[:editor]) %>
+
   <p>
     <%= f.label :file %><br/>
     <%= f.file_field :file %>
@@ -7,7 +9,7 @@
   <p>
     <%= f.submit %>
   </p>
-  
+
 <% end %>
 
 <iframe id='file_upload' name="file_upload" style="width:1px;height:1px;border:0px" src="about:blank"></iframe>

data/wysihat-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wysihat-engine}
-  s.version = "0.1.12"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Kreeftmeijer"]
-  s.date = %q{2010-02-26}
+  s.date = %q{2010-06-04}
   s.description = %q{A Rails engine to help integrate the 37signals WysiHat rich text editor to your application.}
   s.email = %q{jeff@80beans.com}
   s.extra_rdoc_files = [
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.80beans.com/2009/10/01/wysihat-engine/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Rails engine to help integrate the 37signals WysiHat rich text editor to your application.}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: wysihat-engine
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +01:00
+date: 2010-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yui-compressor
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: paperclip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 1
         version: 2.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A Rails engine to help integrate the 37signals WysiHat rich text editor to your application.
 email: jeff@80beans.com
 executables: []
@@ -112,18 +125,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Rails engine to help integrate the 37signals WysiHat rich text editor to your application.