projects
/
openx
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a35a4fb
)
WIP: Switched configuration to an options-object
author
Kai Moritz
<kai@juplo.de>
Wed, 27 Feb 2013 00:03:11 +0000
(
01:03
+0100)
committer
Kai Moritz
<kai@juplo.de>
Wed, 27 Feb 2013 18:29:50 +0000
(19:29 +0100)
jquery.openx.js
patch
|
blob
|
history
openx.jquery.json
patch
|
blob
|
history
diff --git
a/jquery.openx.js
b/jquery.openx.js
index
5825593
..
66d91cb
100644
(file)
--- a/
jquery.openx.js
+++ b/
jquery.openx.js
@@
-25,7
+25,7
@@
var
var
- domain, id, node,
+
settings,
domain, id, node,
count = 0,
slots = {},
count = 0,
slots = {},
@@
-34,7
+34,7
@@
output = [];
output = [];
- $.openx = function(
server,
zones, options ) {
+ $.openx = function( zones, options ) {
if (domain) {
if (console.error)
if (domain) {
if (console.error)
@@
-42,7
+42,20
@@
return;
}
return;
}
- domain = document.location.protocol == 'https:' ? 'https://' + server + ':8443':'http://' + server;
+ settings = $.extend(
+ {
+ 'protocol': document.location.protocol,
+ 'server': 'localhost'
+ },
+ options
+ );
+
+ domain = settings.protocol + '//';
+ domain += settings.server;
+ if (settings.protocol === 'http:' && settings.http_port)
+ domain += ':' + settings.http_port;
+ if (settings.protocol === 'https:' && settings.https_port)
+ domain += ':' + settings.https_port;
var
name,
var
name,
diff --git
a/openx.jquery.json
b/openx.jquery.json
index
daa4b41
..
26855f4
100644
(file)
--- a/
openx.jquery.json
+++ b/
openx.jquery.json
@@
-3,7
+3,7
@@
"title": "jQuery OpenX",
"description": "jQuery plugin, that loads banner-ads from an OpenX-server in an asynchronous and responsive way",
"keywords": [ "openx" ],
"title": "jQuery OpenX",
"description": "jQuery plugin, that loads banner-ads from an OpenX-server in an asynchronous and responsive way",
"keywords": [ "openx" ],
- "version": "0.1.
0
",
+ "version": "0.1.
1
",
"author": { "name": "Kai Moritz", "email": "kai@juplo.de" },
"licenses": [ { "type": "LGPLv3", "url": "http://www.gnu.org/licenses/lgpl-3.0.html" } ],
"homepage": "http://juplo.de/openx",
"author": { "name": "Kai Moritz", "email": "kai@juplo.de" },
"licenses": [ { "type": "LGPLv3", "url": "http://www.gnu.org/licenses/lgpl-3.0.html" } ],
"homepage": "http://juplo.de/openx",