el_vfs_client 0.3.4 → 0.3.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/app/views/el_finder/layout.html.erb +3 -0
  2. data/lib/el_vfs_client/version.rb +1 -1
  3. metadata +55 -40
data/app/views/el_finder/layout.html.erb CHANGED
@@ -34,6 +34,7 @@
34
34
  getFileCallback : function(file) {
35
35
  var info_path = $('#info_path', window.parent.document);
36
36
  var elfinder_picture_dialog = $('#elfinder_picture_dialog', window.parent.document);
37
+ var file_url = $('#file_url', window.parent.document);
37
38
 
38
39
  if (elfinder_picture_dialog.length !=0){
39
40
  var input = $('#'+elfinder_picture_dialog.attr('id_data'), window.parent.document);
@@ -43,6 +44,8 @@
43
44
  }else if (info_path.length != 0){
44
45
  info_path.val(file.hash);
45
46
  parent.$('#info_path').trigger('change');
47
+ }else if (file_url.length != 0){
48
+ file_url.val(file.url);
46
49
  }else{
47
50
  window.opener.CKEDITOR.tools.callFunction(funcNum, file.url);
48
51
  window.close();
data/lib/el_vfs_client/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ElVfsClient
2
- VERSION = "0.3.4"
2
+ VERSION = "0.3.5"
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.3.4
4
+ version: 0.3.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -16,7 +16,7 @@ date: 2012-05-16 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: configliere
19
- requirement: &6571600 !ruby/object:Gem::Requirement
19
+ requirement: !ruby/object:Gem::Requirement
20
20
  none: false
21
21
  requirements:
22
22
  - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
24
24
  version: '0'
25
25
  type: :runtime
26
26
  prerelease: false
27
- version_requirements: *6571600
27
+ version_requirements: !ruby/object:Gem::Requirement
28
+ none: false
29
+ requirements:
30
+ - - ! '>='
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
28
33
  - !ruby/object:Gem::Dependency
29
34
  name: curb
30
- requirement: &6570920 !ruby/object:Gem::Requirement
35
+ requirement: !ruby/object:Gem::Requirement
31
36
  none: false
32
37
  requirements:
33
38
  - - ! '>='
@@ -35,10 +40,15 @@ dependencies:
35
40
  version: '0'
36
41
  type: :runtime
37
42
  prerelease: false
38
- version_requirements: *6570920
43
+ version_requirements: !ruby/object:Gem::Requirement
44
+ none: false
45
+ requirements:
46
+ - - ! '>='
47
+ - !ruby/object:Gem::Version
48
+ version: '0'
39
49
  - !ruby/object:Gem::Dependency
40
50
  name: rails
41
- requirement: &6570280 !ruby/object:Gem::Requirement
51
+ requirement: !ruby/object:Gem::Requirement
42
52
  none: false
43
53
  requirements:
44
54
  - - ! '>='
@@ -46,7 +56,12 @@ dependencies:
46
56
  version: '0'
47
57
  type: :runtime
48
58
  prerelease: false
49
- version_requirements: *6570280
59
+ version_requirements: !ruby/object:Gem::Requirement
60
+ none: false
61
+ requirements:
62
+ - - ! '>='
63
+ - !ruby/object:Gem::Version
64
+ version: '0'
50
65
  description: Description of ElVfsClient.
51
66
  email:
52
67
  - mail@openteam.ru
@@ -54,48 +69,48 @@ executables: []
54
69
  extensions: []
55
70
  extra_rdoc_files: []
56
71
  files:
57
- - app/controllers/el_vfs_client/el_finder_controller.rb
58
- - app/assets/images/el_vfs/ui/ui-bg_glass_65_ffffff_1x400.png
59
- - app/assets/images/el_vfs/ui/ui-icons_454545_256x240.png
60
- - app/assets/images/el_vfs/ui/ui-icons_2e83ff_256x240.png
61
- - app/assets/images/el_vfs/ui/ui-bg_highlight-soft_75_cccccc_1x100.png
62
- - app/assets/images/el_vfs/ui/ui-bg_glass_75_e6e6e6_1x400.png
63
- - app/assets/images/el_vfs/ui/ui-icons_cd0a0a_256x240.png
64
- - app/assets/images/el_vfs/ui/ui-icons_222222_256x240.png
65
- - app/assets/images/el_vfs/ui/ui-bg_glass_95_fef1ec_1x400.png
66
- - app/assets/images/el_vfs/ui/ui-bg_flat_75_ffffff_40x100.png
67
- - app/assets/images/el_vfs/ui/ui-icons_888888_256x240.png
68
- - app/assets/images/el_vfs/ui/ui-bg_flat_0_aaaaaa_40x100.png
69
- - app/assets/images/el_vfs/ui/ui-bg_glass_55_fbf9ee_1x400.png
70
- - app/assets/images/el_vfs/ui/ui-bg_glass_75_dadada_1x400.png
71
- - app/assets/images/el_vfs/elfinder/icons-small.png
72
+ - app/assets/audios/sounds/rm.wav
73
+ - app/assets/images/el_vfs/elfinder/arrows-active.png
72
74
  - app/assets/images/el_vfs/elfinder/arrows-normal.png
73
- - app/assets/images/el_vfs/elfinder/spinner-mini.gif
74
- - app/assets/images/el_vfs/elfinder/progress.gif
75
- - app/assets/images/el_vfs/elfinder/toolbar.png
76
- - app/assets/images/el_vfs/elfinder/quicklook-icons.png
75
+ - app/assets/images/el_vfs/elfinder/crop.gif
76
+ - app/assets/images/el_vfs/elfinder/dialogs.png
77
77
  - app/assets/images/el_vfs/elfinder/icons-big.png
78
+ - app/assets/images/el_vfs/elfinder/icons-small.png
78
79
  - app/assets/images/el_vfs/elfinder/logo.png
79
- - app/assets/images/el_vfs/elfinder/arrows-active.png
80
- - app/assets/images/el_vfs/elfinder/dialogs.png
81
- - app/assets/images/el_vfs/elfinder/resize.png
80
+ - app/assets/images/el_vfs/elfinder/progress.gif
82
81
  - app/assets/images/el_vfs/elfinder/quicklook-bg.png
83
- - app/assets/images/el_vfs/elfinder/crop.gif
82
+ - app/assets/images/el_vfs/elfinder/quicklook-icons.png
83
+ - app/assets/images/el_vfs/elfinder/resize.png
84
+ - app/assets/images/el_vfs/elfinder/spinner-mini.gif
85
+ - app/assets/images/el_vfs/elfinder/toolbar.png
86
+ - app/assets/images/el_vfs/ui/ui-bg_flat_0_aaaaaa_40x100.png
87
+ - app/assets/images/el_vfs/ui/ui-bg_flat_75_ffffff_40x100.png
88
+ - app/assets/images/el_vfs/ui/ui-bg_glass_55_fbf9ee_1x400.png
89
+ - app/assets/images/el_vfs/ui/ui-bg_glass_65_ffffff_1x400.png
90
+ - app/assets/images/el_vfs/ui/ui-bg_glass_75_dadada_1x400.png
91
+ - app/assets/images/el_vfs/ui/ui-bg_glass_75_e6e6e6_1x400.png
92
+ - app/assets/images/el_vfs/ui/ui-bg_glass_95_fef1ec_1x400.png
93
+ - app/assets/images/el_vfs/ui/ui-bg_highlight-soft_75_cccccc_1x100.png
94
+ - app/assets/images/el_vfs/ui/ui-icons_222222_256x240.png
95
+ - app/assets/images/el_vfs/ui/ui-icons_2e83ff_256x240.png
96
+ - app/assets/images/el_vfs/ui/ui-icons_454545_256x240.png
97
+ - app/assets/images/el_vfs/ui/ui-icons_888888_256x240.png
98
+ - app/assets/images/el_vfs/ui/ui-icons_cd0a0a_256x240.png
84
99
  - app/assets/javascripts/el_vfs/elfinder.js
85
- - app/assets/javascripts/el_vfs/i18n/elfinder.ru.js
86
100
  - app/assets/javascripts/el_vfs/i18n/elfinder.LANG.js
101
+ - app/assets/javascripts/el_vfs/i18n/elfinder.ru.js
87
102
  - app/assets/javascripts/engine.js
88
- - app/assets/stylesheets/el_vfs/theme.sass
89
- - app/assets/stylesheets/el_vfs/reset.sass
90
103
  - app/assets/stylesheets/el_vfs/el_vfs.sass
91
- - app/assets/stylesheets/el_vfs/jquery_ui.sass
92
104
  - app/assets/stylesheets/el_vfs/elfinder.sass
93
- - app/assets/audios/sounds/rm.wav
105
+ - app/assets/stylesheets/el_vfs/jquery_ui.sass
106
+ - app/assets/stylesheets/el_vfs/reset.sass
107
+ - app/assets/stylesheets/el_vfs/theme.sass
108
+ - app/controllers/el_vfs_client/el_finder_controller.rb
94
109
  - app/views/el_finder/layout.html.erb
95
110
  - config/routes.rb
96
- - lib/el_vfs_client.rb
97
- - lib/el_vfs_client/version.rb
98
111
  - lib/el_vfs_client/engine.rb
112
+ - lib/el_vfs_client/version.rb
113
+ - lib/el_vfs_client.rb
99
114
  - lib/tasks/el_vfs_client_tasks.rake
100
115
  - MIT-LICENSE
101
116
  - Rakefile
@@ -114,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
114
129
  version: '0'
115
130
  segments:
116
131
  - 0
117
- hash: 4264304147877796131
132
+ hash: -3282862928403984598
118
133
  required_rubygems_version: !ruby/object:Gem::Requirement
119
134
  none: false
120
135
  requirements:
@@ -123,10 +138,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
123
138
  version: '0'
124
139
  segments:
125
140
  - 0
126
- hash: 4264304147877796131
141
+ hash: -3282862928403984598
127
142
  requirements: []
128
143
  rubyforge_project:
129
- rubygems_version: 1.8.10
144
+ rubygems_version: 1.8.24
130
145
  signing_key:
131
146
  specification_version: 3
132
147
  summary: Summary of ElVfsClient.