cedar 0.2.77.pre → 0.2.79.pre
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/assets/javascripts/cedar_config.js.erb +1 -1
- data/lib/assets/javascripts/cedar_source.js +4 -9
- data/lib/cedar/config.rb +2 -2
- data/lib/cedar/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: 38a0a1e27655d8ec921b31b1cd3ff0469d55b41b
|
|
4
|
+
data.tar.gz: bd1412cabfd36a16e7dfc57b1ab0581fce665e05
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 89ec91efe2906fb121395d1690f6c1b9cf5e7812a6959b46fcdc33459d77c907d0127ede79c4bd8c64cfb8e331a18bbe2a50f0bebb198c52d4ce808a2e5325d4
|
|
7
|
+
data.tar.gz: 3fce8c872709c1b8a81b84c3cf701aa064d3ab5dd48f635e85a6bb9b38acefc78885878c73dcc1506c7e245f22f62cee6187a5ea2ea7cd43b836217d9573f538
|
|
@@ -4,6 +4,6 @@ window.Cedar.config.server = "<%= Cedar.config.server %>"
|
|
|
4
4
|
window.Cedar.config.debug = <%= Cedar.config.debug %>
|
|
5
5
|
window.Cedar.config.wait = <%= Cedar.config.wait %>
|
|
6
6
|
window.Cedar.config.fetch = <%= Cedar.config.fetch %>
|
|
7
|
-
window.Cedar.config.
|
|
7
|
+
window.Cedar.config.allowUnsecured = <%= Cedar.config.allow_unsecured %>
|
|
8
8
|
window.Cedar.config.objectNameFilter = "<%= Cedar.config.object_name_filter %>"
|
|
9
9
|
window.Cedar.config.liveMode = <%= Cedar.config.live_mode %>
|
|
@@ -35,11 +35,6 @@ Cedar.debug = function(msg) {
|
|
|
35
35
|
*
|
|
36
36
|
* Application object for initializing and setting global values
|
|
37
37
|
*
|
|
38
|
-
* @param <Array> options
|
|
39
|
-
* - server : 'test.cdr.plyinc.com' - *required
|
|
40
|
-
* - debug : true | false
|
|
41
|
-
* - fetch : true | false
|
|
42
|
-
* - forceHttps : true | false
|
|
43
38
|
*/
|
|
44
39
|
Cedar.Application = function(options) {
|
|
45
40
|
if ( Cedar.initialized ) {
|
|
@@ -50,7 +45,7 @@ Cedar.Application = function(options) {
|
|
|
50
45
|
debug: false,
|
|
51
46
|
fetch: true,
|
|
52
47
|
wait: false,
|
|
53
|
-
|
|
48
|
+
allowUnsecured: false,
|
|
54
49
|
objectNameFilter: '',
|
|
55
50
|
liveMode: true
|
|
56
51
|
};
|
|
@@ -106,10 +101,10 @@ Cedar.Application.prototype.initializeHTML = function() {
|
|
|
106
101
|
};
|
|
107
102
|
|
|
108
103
|
Cedar.Application.prototype.getProtocol = function() {
|
|
109
|
-
if (this.options.
|
|
110
|
-
return 'https://';
|
|
111
|
-
} else {
|
|
104
|
+
if (this.options.allowUnsecured && window.location.protocol === 'http:') {
|
|
112
105
|
return 'http://';
|
|
106
|
+
} else {
|
|
107
|
+
return 'https://';
|
|
113
108
|
}
|
|
114
109
|
};
|
|
115
110
|
|
data/lib/cedar/config.rb
CHANGED
|
@@ -5,14 +5,14 @@
|
|
|
5
5
|
|
|
6
6
|
module Cedar
|
|
7
7
|
class Config
|
|
8
|
-
attr_accessor :server, :debug, :wait, :fetch, :
|
|
8
|
+
attr_accessor :server, :debug, :wait, :fetch, :allow_unsecured, :object_name_filter, :live_mode
|
|
9
9
|
|
|
10
10
|
def initialize
|
|
11
11
|
@server = ''
|
|
12
12
|
@debug = false
|
|
13
13
|
@wait = false
|
|
14
14
|
@fetch = true
|
|
15
|
-
@
|
|
15
|
+
@allow_unsecured = false
|
|
16
16
|
@object_name_filter = ''
|
|
17
17
|
@live_mode = true
|
|
18
18
|
end
|
data/lib/cedar/version.rb
CHANGED