diff options
| author | Zaran <zaran.krleza@gmail.com> | 2011-04-20 11:01:06 +0200 |
|---|---|---|
| committer | Zaran <zaran.krleza@gmail.com> | 2011-04-20 11:04:44 +0200 |
| commit | 7a440ab19f974948f5958f7ebc0df826e98e5cfb (patch) | |
| tree | 319292e77904f3694a1cdc9296320d6aecdb5fe3 | |
| parent | e06a2d86e43ebe86b90f9a318900f70127460ec6 (diff) | |
| download | alias-7a440ab19f974948f5958f7ebc0df826e98e5cfb.tar.gz | |
Add a js configuration file to avoid work conflicts.
Copy the config.js.sample to config.js and set the bosh server and
server component in there. Don't commit the file config.js.
Note: the file config.js will have to be merged with alias.js in
production
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | webclient/index.html | 1 | ||||
| -rw-r--r-- | webclient/lib/alias.js | 3 | ||||
| -rw-r--r-- | webclient/lib/config.js.sample | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -4,3 +4,4 @@ .pydevproject .settings/ config.ini +config.js diff --git a/webclient/index.html b/webclient/index.html index 107e17d..93cb286 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -8,6 +8,7 @@ <title>Alias</title> <script type="text/javascript" src="lib/jquery-1.4.4.js"></script> <script type="text/javascript" src="lib/strophe.min.js"></script> + <script type="text/javascript" src="lib/config.js"></script> <script type="text/javascript" src="lib/alias.js"></script> <script type="text/javascript" src="lib/sjcl.js"></script> <link rel="stylesheet" type="text/css" href="style/alias.css" /> diff --git a/webclient/lib/alias.js b/webclient/lib/alias.js index 9b43abf..bae01cc 100644 --- a/webclient/lib/alias.js +++ b/webclient/lib/alias.js @@ -1,6 +1,3 @@ -var BOSH_SERVICE = 'http://localhost/http-bind'; -var server_component = 'object.localhost'; - /** * Alias namespace */ diff --git a/webclient/lib/config.js.sample b/webclient/lib/config.js.sample new file mode 100644 index 0000000..9339c27 --- /dev/null +++ b/webclient/lib/config.js.sample @@ -0,0 +1,2 @@ +var BOSH_SERVICE = 'http://alias.im/http-bind'; +var server_component = 'social.alias.im';
\ No newline at end of file |