mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-11 09:41:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 04e9c8159f into eb93ce2aa6

Browse source
This commit is contained in:
Wikinaut 2012-12-01 01:44:59 -08:00
commit 7c78a0e9d1
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/node/utils/Settings.js
View file

@ -38,8 +38,6 @@ exports.title = "Etherpad Lite";
* The app favicon fully specified url, visible e.g. in the browser window * The app favicon fully specified url, visible e.g. in the browser window
*/ */
exports.favicon = "favicon.ico"; exports.favicon = "favicon.ico";
exports.faviconPad = "../" + exports.favicon;
exports.faviconTimeslider = "../../" + exports.favicon;
/** /**
* The IP ep-lite should listen to * The IP ep-lite should listen to
@ -169,6 +167,20 @@ exports.reloadSettings = function reloadSettings() {
} }
} }
var favicon = exports.favicon;
if (favicon.match(/^https?:\/\//i))
{
settings.faviconPad = favicon;
settings.faviconTimeslider = favicon;
}else
{
settings.faviconPad = "../" + favicon;
settings.faviconTimeslider = "../../" + favicon;
}
exports.faviconPad = settings.faviconPad;
exports.faviconTimeslider = settings.faviconTimeslider;
if(exports.dbType === "dirty"){ if(exports.dbType === "dirty"){
console.warn("DirtyDB is used. This is fine for testing but not recommended for production.") console.warn("DirtyDB is used. This is fine for testing but not recommended for production.")
} }