foreign_office 0.15.8 → 0.15.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/foreign_office.js +7 -5
- data/lib/foreign_office/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7e2cd672c374052a2b0a0153495886ca4aaf8cb2
|
4
|
+
data.tar.gz: 963f3ea6bf287ce82fd4e728b50f660eedf05aab
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3b520c6fffb6aafb80a46942a087686cbb29600a6a143ada7b03c5f86b5df9c9d600428a1b3c0908f6a46a6cc04bc654ba0d9025e395d891eadf54329043a05b
|
7
|
+
data.tar.gz: c28e7a6151ee08d158ffe4561b66c3ad173e6f6bde4fdd55fdffc562f6daaeeede3c04f0807f42dbc7b4cb13216d97ad4c7b5bde3d6358e1ea9f9bb9900a5230
|
@@ -153,11 +153,13 @@ var ForeignOfficeListener = Class.extend({
|
|
153
153
|
return true
|
154
154
|
}
|
155
155
|
if(this.endpoint){
|
156
|
+
let $progress_target = null
|
157
|
+
if($listener.data('progress-target')){
|
158
|
+
$progress_target = $($listener.data('progress-target'))
|
159
|
+
} else {
|
160
|
+
$progress_target = []
|
161
|
+
}
|
156
162
|
if (m.object[this.object_key] == true) {
|
157
|
-
let $progress_target = null
|
158
|
-
if($listener.data('progress-target').length > 0){
|
159
|
-
$progress_target = $($listener.data('progress-target'))
|
160
|
-
}
|
161
163
|
let progress_indicator = new thin_man.AjaxProgress($progress_target,$listener,'black')
|
162
164
|
$.get(this.endpoint, function(data){
|
163
165
|
$listener.html(data);
|
@@ -167,7 +169,7 @@ var ForeignOfficeListener = Class.extend({
|
|
167
169
|
}else if(m.object[this.object_key] == false) {
|
168
170
|
$listener.empty();
|
169
171
|
}else if(typeof(m.object[this.object_key]) == 'string'){
|
170
|
-
let progress_indicator = new thin_man.AjaxProgress($
|
172
|
+
let progress_indicator = new thin_man.AjaxProgress($progress_target,$listener,'black')
|
171
173
|
$.get(m.object[this.object_key], function(data){
|
172
174
|
$listener.html(data);
|
173
175
|
}).always(function(){
|