summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2014-12-01 18:01:52 +0100
committerYorhel <git@yorhel.nl>2014-12-01 18:01:52 +0100
commit44b11883da3a7e6f1138984ceeba162e0f90dc35 (patch)
tree79b22e53d9eb5dbf24cb23a9b3da514e2a4596d4
parent9fec1650573a8016339de7fed7829a9b236033a2 (diff)
Don't use inline script to pass screenshot sizes in VN edit
Same reasoning as 0d191b5cd8c79eef3cef63c40ded96506a40382a
-rw-r--r--data/script.js4
-rw-r--r--lib/VNDB/Handler/VNEdit.pm13
2 files changed, 9 insertions, 8 deletions
diff --git a/data/script.js b/data/script.js
index 8d89349e..5aae0305 100644
--- a/data/script.js
+++ b/data/script.js
@@ -1008,9 +1008,11 @@ function scrLoad() {
// load the current screenshots
var scr = byId('screenshots').value.split(' ');
+ var siz = byId('screensizes').value.split(' ');
for(i=0; i<scr.length && scr[i].length>1; i++) {
var r = scr[i].split(',');
- scrSet(scrAdd(r[0], r[1], r[2]), VNEDITSCR[r[0]][0], VNEDITSCR[r[0]][1]);
+ var s = siz[i].split(',');
+ scrSet(scrAdd(r[0], r[1], r[2]), s[0], s[1]);
}
ivInit();
diff --git a/lib/VNDB/Handler/VNEdit.pm b/lib/VNDB/Handler/VNEdit.pm
index fb64ae86..b5c84c3a 100644
--- a/lib/VNDB/Handler/VNEdit.pm
+++ b/lib/VNDB/Handler/VNEdit.pm
@@ -298,14 +298,13 @@ sub _form {
[ static => nolabel => 1, content => mt '_vnedit_scrnorel' ],
) : (
[ hidden => short => 'screenshots' ],
+ [ hidden => short => 'screensizes', value => do {
+ # Current screenshot resolutions, for use by Javascript
+ my @scr = map /^(\d+),/?$1:(), split / /, $frm->{screenshots};
+ my %scr = map +($_->{id}, "$_->{width},$_->{height}"), @{$self->dbScreenshotGet(\@scr)};
+ join ' ', map $scr{$_}, @scr;
+ }],
[ static => nolabel => 1, content => sub {
- script type => 'text/javascript';
- # Screenshot resolutions
- lit 'VNEDITSCR = {';
- my @scr = map /^(\d+),/?$1:(), split / /, $frm->{screenshots};
- lit join ',', map "$_->{id}:[$_->{width},$_->{height}]", @scr ? @{$self->dbScreenshotGet(\@scr)} : ();
- lit '};';
- end;
div class => 'warning';
lit mt '_vnedit_scrmsg';
end;