rails_wangeditor 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78a8c3bf30330b9aee4417c1e3ee7b5f52144ac7
-  data.tar.gz: 9fc740643188b8c31e58861c12c347712302dacf
+  metadata.gz: faf94367c7b9d3a5feb3b066ca3fa9c297ef3ae3
+  data.tar.gz: 81a9351dfcd8616d448b0b312bc0651c47e363c6
 SHA512:
-  metadata.gz: 6d6f16313c28ec69e8e66407d44c1c9cbda85adc1b8b7f366c64f2cd4555b089d1519dff746c0f0ffcf34cdef43f1627b1243ebcef4aa9529719c0195742904e
-  data.tar.gz: 1943f184750f70c8f339288de431b58564defa74cc51194bff815f55bc4a1e5504800111586eb68d5b7babca84f9543776abff60d1fdeacac340740d29daa487
+  metadata.gz: 18c72b8656e57be5b98e580ac2cf94ea9e2abb22672a9e98a06b38ebf92f8b92f0aed303f55a6935cf7f9434df7f486b93ecd49eb7b2e4befd7d0cead446936f
+  data.tar.gz: 12f6c0b33e03541488b695883291e31ce0b44e03b26d3c59a6d65a311e12aedff9badd6735d451c13be57c7f02f353b8aa0954ecb660a7997c8157a7bae42c54

data/app/controllers/wangeditor/assets_controller.rb

@@ -14,7 +14,11 @@ class Wangeditor::AssetsController < ApplicationController
           logger.warn '=====Warning: the owner have not been created, "delete uploaded files automatically" will not work. ====' if defined?(logger) && @asset.owner_id == 0
           @asset.asset_type = @dir
           if @asset.save
-            render :text => @asset.asset.url
+            url = @asset.asset.url
+            if ENV['RAILS_RELATIVE_URL_ROOT']
+              url = ENV['RAILS_RELATIVE_URL_ROOT'] + url
+            end
+            render :text => url
           else
             show_error(@asset.errors.full_messages)
           end
@@ -25,7 +29,11 @@ class Wangeditor::AssetsController < ApplicationController
         begin
           uploader = "Wangeditor::#{@dir.camelize}Uploader".constantize.new
           uploader.store!(@imgFile)
-          render :text => ({:error => 0, :url => uploader.url}.to_json)
+          url = uploader.url
+          if ENV['RAILS_RELATIVE_URL_ROOT']
+            url = ENV['RAILS_RELATIVE_URL_ROOT'] + url
+          end
+          render :text => url
         rescue CarrierWave::UploadError => e
           show_error(e.message)
         rescue Exception => e

data/config/routes.rb

@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
   namespace :wangeditor do
     post "/upload" => "assets#create"
-    get  "/filemanager" => "assets#list"
   end
 end

data/lib/rails_wangeditor/helper.rb

@@ -44,7 +44,12 @@ module RailsWangeditor
 
     def main_app_root_url
       begin
-        main_app.root_url.slice(0, main_app.root_url.rindex(main_app.root_path)) + '/'
+        main_app_root_url = main_app.root_url.slice(0, main_app.root_url.rindex(main_app.root_path))
+        if ENV['RAILS_RELATIVE_URL_ROOT']
+          main_app_root_url += ENV['RAILS_RELATIVE_URL_ROOT'] + "/"
+        else
+          main_app_root_url += "/"
+        end
       rescue
         '/'
       end

data/lib/rails_wangeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsWangeditor
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_wangeditor
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - rubycat