el_vfs_client 0.0.5.1 → 0.0.5.2

data/app/assets/stylesheets/el_vfs/elfinder.sass

@@ -916,10 +916,6 @@
   width: 100%
   margin: 0 0 .5em 0
 
-/* one folder wrapper
-
-.elfinder-navbar-wrapper, .elfinder-place-wrapper
-
 /* folder
 
 .elfinder-navbar-dir

data/app/controllers/el_vfs_client/el_finder_controller.rb

@@ -3,12 +3,11 @@ require 'configliere'
 require 'uuid'
 
 module ElVfsClient
-  class ElFinderController < ApplicationController
+  class ElFinderController < ActionController::Base
     respond_to :json, :html
 
     def show
-      session[:root_path] = session[:root_path]  || (params[:root_path] ? params[:root_path] : generate_folder_uuid)
-
+      @root_path = root_path
       render :file => 'el_finder/layout', :layout => false
     end
 
@@ -45,11 +44,12 @@ module ElVfsClient
     private
       def url
         url = "#{Settings[:el_vfs][:protocol]}://#{Settings[:el_vfs][:host]}:#{Settings[:el_vfs][:port]}/api/el_finder/v2"
-        url << "/#{Settings[:el_vfs][:root_path]}/#{session[:root_path]}" if session[:root_path]
+        url << params.delete(:root_path)
+        return url
       end
 
-      def generate_folder_uuid
-        "#{Time.now.year}_#{Time.now.month}_#{Time.now.day}_#{Time.now.hour}_#{Time.now.min}_#{UUID.generate.split('-').first}"
+      def root_path
+        PathInterpolator.path(params)
       end
   end
 end

data/app/views/el_finder/layout.html.erb

@@ -18,6 +18,9 @@
 
           $('#elfinder').elfinder({
             url: '/api/el_finder/v2',
+            customData: {
+              root_path: '<%= @root_path %>'
+            },
             height: window.innerHeight - 23,
             lang: 'ru',
             ui: ['toolbar'],
@@ -31,7 +34,7 @@
             resizable: false
           }).elfinder('instance');
 
-          $('#root_path', window.parent.document).val('<%= session[:root_path] %>');
+          $('#root_path', window.parent.document).val('<%= @root_path %>');
         });
       //]]>
     </script>

data/lib/el_vfs_client/version.rb

@@ -1,3 +1,3 @@
 module ElVfsClient
-  VERSION = "0.0.5.1"
+  VERSION = "0.0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: el_vfs_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5.1
+  version: 0.0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2011-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &7400580 !ruby/object:Gem::Requirement
+  requirement: &12549160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7400580
+  version_requirements: *12549160
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &7399540 !ruby/object:Gem::Requirement
+  requirement: &12547940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7399540
+  version_requirements: *12547940
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &7398380 !ruby/object:Gem::Requirement
+  requirement: &12563540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7398380
+  version_requirements: *12563540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &7413460 !ruby/object:Gem::Requirement
+  requirement: &12562680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7413460
+  version_requirements: *12562680
 description: Description of ElVfsClient.
 email:
 - mail@openteam.ru
@@ -121,18 +121,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 862774303878164287
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 862774303878164287
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10