From 67e8e408a86c8d4429e5985ddacfecf39a48dead Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Aug 2008 18:46:50 +0200 Subject: [PATCH] New version, added ways to tweak difference between project name and live site name (e.g. ol2008.tv2.dk vs. ol.tv2.dk) --- content/tv2developer.js | 21 +++++++++++++++++++-- version | 2 +- webroot/index.html | 6 ++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/content/tv2developer.js b/content/tv2developer.js index 43dce51..eb5dce4 100644 --- a/content/tv2developer.js +++ b/content/tv2developer.js @@ -207,13 +207,30 @@ var TV2Developer = { // Find live, test and snapshot url for current site var liveurl; var live_sitename = (tv2_sitename=='www') ? '' : tv2_sitename+'.'; + var live_sitename_complete = live_sitename + 'tv2.dk'; var cvs_sitename = tv2_sitename ? tv2_sitename : 'www'; + // Handle sites with aliases (e.g. ol2008.tv2.dk is ol.tv2.dk on live... ) + var docWin = getBrowser().contentWindow; + if (docWin.wrappedJSObject) { + var docObj = docWin.wrappedJSObject; + if (docObj.TV2_PROJECTNAME) { + var nodomain = /^(.*)\.tv2\.dk$/.exec(docObj.TV2_PROJECTNAME); + if (nodomain) { + cvs_sitename = nodomain[1]; + } + } + if (docObj.TV2_LIVESITE) { + live_sitename_complete = docObj.TV2_LIVESITE; + } + } + + // Construct corresponding live URL if (tv2_testsite) { // test or snapshot if (tv2_sitetype) { /* opdatering, ... */ liveurl = tv2_sitename+'.'+tv2_sitetype+'.tv2.dk'; } else { - liveurl = live_sitename+'tv2.dk'; + liveurl = live_sitename_complete; } } @@ -248,7 +265,7 @@ var TV2Developer = { //var template = _prefix + '.template' + _postfix; var robot = _prefix + '.robot' + _postfix; var normal = (tv2_testsite ? _prefix + '.' + tv2_testsite + '.tv2.dk' - : live_sitename + 'tv2.dk'); + : live_sitename_complete); links.push(new this.TV2Link('opdatering_swap', (tv2_sitetype!='opdatering')?opdatering:normal, '/', (tv2_sitetype!='opdatering') ? TV2Util.getStr('opdatering.accesskey') : TV2Util.getStr('webroot.accesskey'))); /*links.push(new this.TV2Link('template_swap', (tv2_sitetype!='template')?template:normal, '/', diff --git a/version b/version index 78bc1ab..5712157 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.10.0 +0.10.1 diff --git a/webroot/index.html b/webroot/index.html index 7985211..ee0ad44 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -34,6 +34,12 @@ Browserens cache tømmes desuden automatisk.
  • Quick link dialog, hvor man hurtig kan navigere hen til et tv2.dk site - genvej ALT+3, (Alternativ til Mac: Command+F3)
  • +

    Magiske javascript variabler

    +

    Feature liste på i2-images og i2-files: