oxymoron 1.1.6 → 1.1.7
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/oxymoron/notifier.js.erb +12 -4
- data/lib/oxymoron/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ae40f0c786d5ac804d6e9a5b6cc7142cd35bbdd2
|
|
4
|
+
data.tar.gz: 403e4c6245ba02bc8796803bbbe42b76cf1b6ce6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2ece8b4fd74ec7753e9a4c9d249e3222cc25f7e03273d19874eee634dfcb497043153a7d5092cef480e0c5e2564b39ea2bca5278be55bd043f0b75e13fb5eba7
|
|
7
|
+
data.tar.gz: 50933f6818b99470921ae069051c2b58d74e80dc5c0c0aa35173ce1ecb8dde15b215d4478706b5a5a771314d59dbc60b4f3ebc4c310464304a5dc9ede133979a
|
|
@@ -17,10 +17,18 @@ angular.module("oxymoron.notifier", [])
|
|
|
17
17
|
Validate(res.data.form_name || res.config.data.form_name, res.data.errors)
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
if (res.data.
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
if (res.data.reload) {
|
|
21
|
+
if (res.data.redirect_to_url) {
|
|
22
|
+
window.location = res.data.redirect_to_url;
|
|
23
|
+
} else if (res.data.redirect_to) {
|
|
24
|
+
$state.transitionTo(res.data.redirect_to, res.data.redirect_options || {}, {notify: false, location: true, reload: true});
|
|
25
|
+
}
|
|
26
|
+
} else {
|
|
27
|
+
if (res.data.redirect_to_url) {
|
|
28
|
+
$location.url(res.data.redirect_to_url);
|
|
29
|
+
} else if (res.data.redirect_to) {
|
|
30
|
+
$state.go(res.data.redirect_to, res.data.redirect_options || {});
|
|
31
|
+
}
|
|
24
32
|
}
|
|
25
33
|
|
|
26
34
|
if (res.data.reload) {
|
data/lib/oxymoron/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: oxymoron
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kononenko Paul
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-03-
|
|
11
|
+
date: 2017-03-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: awesome_print
|