[Pkg-javascript-commits] [pdf.js] 200/204: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sat Oct 25 18:50:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit ca61e8dcd4028d320081b225fa37d1cd5311c7cc
Author: David Prévot <taffit at debian.org>
Date: Sat Oct 25 12:57:03 2014 -0400
Refresh patches
---
debian/patches/0001-No-embedded-PDF.patch | 10 +++++-----
.../0002-Fix-build-versions-in-generated-file.patch | 6 +++---
...fix-ownCloud-specific-loading-of-the-pdf-document.patch | 8 ++++----
.../ownCloud/0005-adjust-close-button-position.patch | 4 ++--
debian/patches/ownCloud/0006-open-buttons-removed.patch | 4 ++--
...0007-Make-PDF-viewer-working-again-in-public-view.patch | 10 +++++-----
...ode-instead-of-encode-because-we-need-to-pass-HTM.patch | 12 ++++++------
.../patches/ownCloud/0009-URL-encode-needed-values.patch | 12 ++++++------
.../0010-Build-ownCloud-specific-version-in-oc.patch | 2 +-
debian/patches/ownCloud/0011-Drop-attachment-feature.patch | 14 +++++++-------
10 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index e663a62..9624c4f 100644
--- a/debian/patches/0001-No-embedded-PDF.patch
+++ b/debian/patches/0001-No-embedded-PDF.patch
@@ -13,21 +13,21 @@ Forwarded: not-needed
1 file changed, 2 deletions(-)
diff --git a/make.js b/make.js
-index 55945af..8494a21 100644
+index 3a4456f..e5383a2 100644
--- a/make.js
+++ b/make.js
-@@ -122,7 +122,6 @@ target.generic = function() {
+@@ -129,7 +129,6 @@ target.generic = function() {
+ ['LICENSE', GENERIC_DIR],
['external/webL10n/l10n.js', GENERIC_DIR + '/web'],
- ['web/viewer.css', GENERIC_DIR + '/web'],
['web/compatibility.js', GENERIC_DIR + '/web'],
- ['web/compressed.tracemonkey-pldi-09.pdf', GENERIC_DIR + '/web'],
['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
['web/locale', GENERIC_DIR + '/web']
],
-@@ -493,7 +492,6 @@ target.minified = function() {
+@@ -642,7 +641,6 @@ target.minified = function() {
+ defines: defines,
copy: [
[COMMON_WEB_FILES, MINIFIED_DIR + '/web'],
- ['web/viewer.css', MINIFIED_DIR + '/web'],
- ['web/compressed.tracemonkey-pldi-09.pdf', MINIFIED_DIR + '/web'],
['external/bcmaps/*', MINIFIED_DIR + '/web/cmaps'],
['web/locale', MINIFIED_DIR + '/web']
diff --git a/debian/patches/0002-Fix-build-versions-in-generated-file.patch b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
index da3e60b..ed7620d 100644
--- a/debian/patches/0002-Fix-build-versions-in-generated-file.patch
+++ b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
@@ -13,10 +13,10 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/make.js b/make.js
-index 8494a21..ecb0bcc 100644
+index e5383a2..2e2da64 100644
--- a/make.js
+++ b/make.js
-@@ -344,8 +344,7 @@ target.bundle = function(args) {
+@@ -485,8 +485,7 @@ target.bundle = function(args) {
var bundleContent = cat(SRC_FILES),
bundleVersion = VERSION,
@@ -26,7 +26,7 @@ index 8494a21..ecb0bcc 100644
crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
-@@ -561,14 +560,7 @@ target.buildnumber = function() {
+@@ -716,14 +715,7 @@ target.buildnumber = function() {
echo();
echo('### Getting extension build number');
diff --git a/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
index d2fcfd0..d0c41aa 100644
--- a/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
+++ b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
@@ -9,16 +9,16 @@ Gbp: Topic ownCloud
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 4a4282e..8f06580 100644
+index 3a86c3d..bf14ba1 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1987,7 +1987,8 @@ function webViewerInitialized() {
+@@ -1701,7 +1701,8 @@ function webViewerInitialized() {
//#if !B2G && !CHROME
if (file) {
-- PDFView.open(file, 0);
+- PDFViewerApplication.open(file, 0);
+ // owncould customization to load file from files app
-+ PDFView.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
++ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
}
//#endif
//#if CHROME
diff --git a/debian/patches/ownCloud/0005-adjust-close-button-position.patch b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
index 2c5e04e..b5f32ee 100644
--- a/debian/patches/ownCloud/0005-adjust-close-button-position.patch
+++ b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
@@ -9,10 +9,10 @@ Gbp: Topic ownCloud
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/viewer.css b/web/viewer.css
-index c7dce03..a04fbc7 100644
+index 856a0c8..8a81823 100644
--- a/web/viewer.css
+++ b/web/viewer.css
-@@ -508,7 +508,7 @@ html[dir='ltr'] #toolbarViewerRight,
+@@ -493,7 +493,7 @@ html[dir='ltr'] #toolbarViewerRight,
html[dir='rtl'] #toolbarViewerLeft {
position: absolute;
top: 0;
diff --git a/debian/patches/ownCloud/0006-open-buttons-removed.patch b/debian/patches/ownCloud/0006-open-buttons-removed.patch
index 49ed5b8..848535e 100644
--- a/debian/patches/ownCloud/0006-open-buttons-removed.patch
+++ b/debian/patches/ownCloud/0006-open-buttons-removed.patch
@@ -9,10 +9,10 @@ Gbp: Topic ownCloud
1 file changed, 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 8f06580..8efe60f 100644
+index bf14ba1..d3f9f5c 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1948,9 +1948,6 @@ function webViewerInitialized() {
+@@ -1662,9 +1662,6 @@ function webViewerInitialized() {
document.getElementById('presentationMode').addEventListener('click',
SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
diff --git a/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
index 6a19f51..0945cef 100644
--- a/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
+++ b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
@@ -15,23 +15,23 @@ Gbp: Topic ownCloud
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 8efe60f..d40606d 100644
+index d3f9f5c..fd4cd09 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1983,9 +1983,13 @@ function webViewerInitialized() {
+@@ -1697,9 +1697,13 @@ function webViewerInitialized() {
//#endif
//#if !B2G && !CHROME
- if (file) {
- // owncould customization to load file from files app
-- PDFView.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
+- PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
+ // owncould customization to load file
+ if (file && dir !== '') {
+ // Logged in
-+ PDFView.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
++ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
+ } else {
+ // Public view
-+ PDFView.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+encodeURIComponent(window.file)+"&download", 1.0);
++ PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+encodeURIComponent(window.file)+"&download", 1.0);
}
//#endif
//#if CHROME
diff --git a/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch b/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
index ff896c6..3ef2b19 100644
--- a/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
+++ b/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
@@ -9,19 +9,19 @@ Gbp: Topic ownCloud
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index d40606d..bf9a6fe 100644
+index fd4cd09..4da4ef4 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1986,10 +1986,10 @@ function webViewerInitialized() {
+@@ -1700,10 +1700,10 @@ function webViewerInitialized() {
// owncould customization to load file
if (file && dir !== '') {
// Logged in
-- PDFView.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
-+ PDFView.open(OC.linkTo('files', 'ajax/download.php')+"?files="+decodeURIComponent(window.file)+"&dir="+decodeURIComponent(window.dir), 1.0);
+- PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
++ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+decodeURIComponent(window.file)+"&dir="+decodeURIComponent(window.dir), 1.0);
} else {
// Public view
-- PDFView.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+encodeURIComponent(window.file)+"&download", 1.0);
-+ PDFView.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+decodeURIComponent(window.file)+"&download", 1.0);
+- PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+encodeURIComponent(window.file)+"&download", 1.0);
++ PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+decodeURIComponent(window.file)+"&download", 1.0);
}
//#endif
//#if CHROME
diff --git a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
index 864f1f0..59fa9f1 100644
--- a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
+++ b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
@@ -22,21 +22,21 @@ Gbp: Topic ownCloud
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index bf9a6fe..8a6754f 100644
+index 4da4ef4..5e3ae4c 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1985,11 +1985,11 @@ function webViewerInitialized() {
+@@ -1699,11 +1699,11 @@ function webViewerInitialized() {
//#if !B2G && !CHROME
// owncould customization to load file
if (file && dir !== '') {
- // Logged in
-- PDFView.open(OC.linkTo('files', 'ajax/download.php')+"?files="+decodeURIComponent(window.file)+"&dir="+decodeURIComponent(window.dir), 1.0);
+- PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+decodeURIComponent(window.file)+"&dir="+decodeURIComponent(window.dir), 1.0);
+ // Logged in
-+ PDFView.open(OC.linkTo('files', 'ajax/download.php')+"?files="+window.file+"&dir="+window.dir, 1.0);
++ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+window.file+"&dir="+window.dir, 1.0);
} else {
// Public view
-- PDFView.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+decodeURIComponent(window.file)+"&download", 1.0);
-+ PDFView.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+window.file+"&download", 1.0);
+- PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+decodeURIComponent(window.file)+"&download", 1.0);
++ PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+window.file+"&download", 1.0);
}
//#endif
//#if CHROME
diff --git a/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
index 574e8ff..efe7735 100644
--- a/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
+++ b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
@@ -9,7 +9,7 @@ Gbp: Topic ownCloud
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.js b/make.js
-index ecb0bcc..5c59a0d 100644
+index 2e2da64..422720d 100644
--- a/make.js
+++ b/make.js
@@ -34,7 +34,7 @@ var BUILD_NUMBER,
diff --git a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
index eb460e4..8c2a13b 100644
--- a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
+++ b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
@@ -9,10 +9,10 @@ Gbp: Topic ownCloud
1 file changed, 7 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 8a6754f..6a22e22 100644
+index 5e3ae4c..c59b4ec 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1436,7 +1436,6 @@ var PDFView = {
+@@ -1222,7 +1222,6 @@ var PDFViewerApplication = {
thumbsButton.classList.add('toggled');
outlineButton.classList.remove('toggled');
@@ -20,7 +20,7 @@ index 8a6754f..6a22e22 100644
thumbsView.classList.remove('hidden');
outlineView.classList.add('hidden');
attachmentsView.classList.add('hidden');
-@@ -1454,7 +1453,6 @@ var PDFView = {
+@@ -1237,7 +1236,6 @@ var PDFViewerApplication = {
case 'outline':
thumbsButton.classList.remove('toggled');
outlineButton.classList.add('toggled');
@@ -28,15 +28,15 @@ index 8a6754f..6a22e22 100644
thumbsView.classList.add('hidden');
outlineView.classList.remove('hidden');
attachmentsView.classList.add('hidden');
-@@ -1900,11 +1898,6 @@ function webViewerInitialized() {
- PDFView.switchSidebarView('outline');
+@@ -1616,11 +1614,6 @@ function webViewerInitialized() {
+ PDFViewerApplication.switchSidebarView('outline');
});
- document.getElementById('viewAttachments').addEventListener('click',
- function() {
-- PDFView.switchSidebarView('attachments');
+- PDFViewerApplication.switchSidebarView('attachments');
- });
-
document.getElementById('previous').addEventListener('click',
function() {
- PDFView.page--;
+ PDFViewerApplication.page--;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list