From dc08e87bd58ea430d8ac145fe4b610c741aca77f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 27 Aug 2012 18:22:33 +0200 Subject: [PATCH] BUG Take first non-empty link field for preview Goes by priority, but allows for fields to be empty. This is important e.g. for models which are removed just from live, or just from draft. Also reacts to a field rename done in CMS module (62783c75). --- admin/javascript/LeftAndMain.Preview.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/admin/javascript/LeftAndMain.Preview.js b/admin/javascript/LeftAndMain.Preview.js index ab082c442..d421250c2 100644 --- a/admin/javascript/LeftAndMain.Preview.js +++ b/admin/javascript/LeftAndMain.Preview.js @@ -67,7 +67,10 @@ if(this.is('.is-collapsed')) return; // var url = ui.xmlhttp.getResponseHeader('x-frontend-url'); - var url = $('.cms-edit-form').find(':input[name=PreviewURL],:input[name=StageURLSegment]').val(); + var url = $('.cms-edit-form') + .find(':input[name=PreviewURL],:input[name=StageLink],:input[name=LiveLink]') + .filter(function() {return $(this).val() !== '';}) + .val(); if(url) { this.loadUrl(url); this.unblock(); @@ -294,7 +297,11 @@ onclick: function(e) { e.preventDefault(); - var preview = $('.cms-preview'), url = $('.cms-edit-form').find(':input[name=PreviewURL],:input[name=StageURLSegment]').val(); + var preview = $('.cms-preview'), + url = $('.cms-edit-form') + .find(':input[name=PreviewURL],:input[name=StageLink],:input[name=LiveLink]') + .filter(function() {return $(this).val() !== '';}) + .val(); if(url) { preview.loadUrl(url); preview.unblock();