el_vfs_client 0.0.5.2 → 0.0.5.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/README.rdoc +1 -1
  2. data/app/controllers/el_vfs_client/el_finder_controller.rb +3 -0
  3. data/app/views/el_finder/layout.html.erb +17 -6
  4. data/lib/el_vfs_client/version.rb +1 -1
  5. metadata +16 -10
data/README.rdoc CHANGED
@@ -61,7 +61,7 @@ For Rails 3.1.x in application.js
61
61
 
62
62
  === Routes
63
63
 
64
- mount ElVfsClient::Engine => '/'
64
+ mount ElVfsClient::Engine => '/'
65
65
 
66
66
  === Set el_vfs url
67
67
 
data/app/controllers/el_vfs_client/el_finder_controller.rb CHANGED
@@ -30,6 +30,9 @@ module ElVfsClient
30
30
  parameters = params.map{ |key, value| Curl::PostField.content(key, value)}
31
31
  files = upload.map{ |file| Curl::PostField.file('upload[]', file.path, file.original_filename) }
32
32
  c.http_post(*parameters, *files)
33
+ elsif params['cmd'] == 'put'
34
+ parameters = params.map{ |key, value| Curl::PostField.content(key, value)}
35
+ c.http_post(*parameters)
33
36
  else
34
37
  c.url << "?#{params.to_query}"
35
38
  c.http_get
data/app/views/el_finder/layout.html.erb CHANGED
@@ -21,16 +21,27 @@
21
21
  customData: {
22
22
  root_path: '<%= @root_path %>'
23
23
  },
24
- height: window.innerHeight - 23,
25
24
  lang: 'ru',
26
- ui: ['toolbar'],
25
+ ui: ['tree', 'toolbar'],
26
+ commandsOptions: {
27
+ getfile: {
28
+ onlyURL: false
29
+ }
30
+ },
27
31
  uiOptions: {
28
- toolbar: [['mkdir', 'upload', 'quicklook', 'rm']],
32
+ toolbar: [['back', 'mkdir', 'upload', 'quicklook', 'rm']],
29
33
  },
30
34
  getFileCallback : function(file) {
31
- window.opener.CKEDITOR.tools.callFunction(funcNum, file);
32
- window.close();
33
- },
35
+ var info_path = $('#info_path', window.parent.document);
36
+
37
+ if (info_path.length != 0){
38
+ info_path.val(file.hash);
39
+ parent.$('#info_path').trigger('change');
40
+ }else{
41
+ window.opener.CKEDITOR.tools.callFunction(funcNum, file.url);
42
+ window.close();
43
+ };
44
+ },
34
45
  resizable: false
35
46
  }).elfinder('instance');
36
47
 
data/lib/el_vfs_client/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ElVfsClient
2
- VERSION = "0.0.5.2"
2
+ VERSION = "0.0.5.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: el_vfs_client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5.2
4
+ version: 0.0.5.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -12,11 +12,11 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2011-12-02 00:00:00.000000000 Z
15
+ date: 2011-12-12 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: configliere
19
- requirement: &12549160 !ruby/object:Gem::Requirement
19
+ requirement: &4160680 !ruby/object:Gem::Requirement
20
20
  none: false
21
21
  requirements:
22
22
  - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
24
24
  version: '0'
25
25
  type: :runtime
26
26
  prerelease: false
27
- version_requirements: *12549160
27
+ version_requirements: *4160680
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: curb
30
- requirement: &12547940 !ruby/object:Gem::Requirement
30
+ requirement: &4159660 !ruby/object:Gem::Requirement
31
31
  none: false
32
32
  requirements:
33
33
  - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
35
35
  version: '0'
36
36
  type: :runtime
37
37
  prerelease: false
38
- version_requirements: *12547940
38
+ version_requirements: *4159660
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: uuid
41
- requirement: &12563540 !ruby/object:Gem::Requirement
41
+ requirement: &4158420 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
44
  - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: '0'
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *12563540
49
+ version_requirements: *4158420
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: rails
52
- requirement: &12562680 !ruby/object:Gem::Requirement
52
+ requirement: &4173540 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
57
57
  version: '0'
58
58
  type: :runtime
59
59
  prerelease: false
60
- version_requirements: *12562680
60
+ version_requirements: *4173540
61
61
  description: Description of ElVfsClient.
62
62
  email:
63
63
  - mail@openteam.ru
@@ -121,12 +121,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
121
121
  - - ! '>='
122
122
  - !ruby/object:Gem::Version
123
123
  version: '0'
124
+ segments:
125
+ - 0
126
+ hash: 3624400893189405873
124
127
  required_rubygems_version: !ruby/object:Gem::Requirement
125
128
  none: false
126
129
  requirements:
127
130
  - - ! '>='
128
131
  - !ruby/object:Gem::Version
129
132
  version: '0'
133
+ segments:
134
+ - 0
135
+ hash: 3624400893189405873
130
136
  requirements: []
131
137
  rubyforge_project:
132
138
  rubygems_version: 1.8.10