From e92e6e79c0a2d0b46811a93b25e64e055026aa1e Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 18 Nov 2015 08:44:46 +0100 Subject: [PATCH] [IMP] simplify code --- attachment_preview/static/src/js/attachment_preview.js | 6 +++--- attachment_preview/static/src/js/viewerjs_tweaks.js | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/attachment_preview/static/src/js/attachment_preview.js b/attachment_preview/static/src/js/attachment_preview.js index f47426d3..2f3d7b46 100644 --- a/attachment_preview/static/src/js/attachment_preview.js +++ b/attachment_preview/static/src/js/attachment_preview.js @@ -28,10 +28,10 @@ openerp.attachment_preview = function(instance) { var url = (window.location.origin || '') + '/attachment_preview/static/lib/ViewerJS/index.html' + - '&type=' + encodeURIComponent(attachment_extension) + - '#' + - attachment_url.replace(window.location.origin, '') + + '?type=' + encodeURIComponent(attachment_extension) + '&title=' + encodeURIComponent(attachment_title) + + '#' + + attachment_url.replace(window.location.origin, '') window.open(url); }; openerp.attachment_preview.can_preview = function(extension) diff --git a/attachment_preview/static/src/js/viewerjs_tweaks.js b/attachment_preview/static/src/js/viewerjs_tweaks.js index 2eb1968f..0adb7d14 100644 --- a/attachment_preview/static/src/js/viewerjs_tweaks.js +++ b/attachment_preview/static/src/js/viewerjs_tweaks.js @@ -28,10 +28,5 @@ Viewer = function(plugin, parameters) { alert('Unsupported file type'); } - var matches = (/&title=([^&]+)&/).exec(window.location.hash); - if(matches && matches.length > 1) - { - parameters.title = decodeURIComponent(matches[1]); - } return original_Viewer(plugin, parameters); }