From 9ebe180fe2bd9f7c4fdfa415fd837a0be1b608aa Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Mon, 20 Jul 2015 19:54:21 +0100
Subject: [PATCH] PDF.js version 1.1.324

---
 bower.json            | 2 +-
 build/pdf.combined.js | 4 ++--
 build/pdf.js          | 4 ++--
 build/pdf.worker.js   | 4 ++--
 package.json          | 2 +-
 web/pdf_viewer.js     | 3 ---
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/bower.json b/bower.json
index c90402987..23352db4a 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.322",
+  "version": "1.1.324",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 7bbbe024f..18385ac63 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.322';
-PDFJS.build = 'd3e90cf';
+PDFJS.version = '1.1.324';
+PDFJS.build = 'c42613b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.js b/build/pdf.js
index 19a09892d..112d94730 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.322';
-PDFJS.build = 'd3e90cf';
+PDFJS.version = '1.1.324';
+PDFJS.build = 'c42613b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index f6fe19afd..8248ed8e3 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.322';
-PDFJS.build = 'd3e90cf';
+PDFJS.version = '1.1.324';
+PDFJS.build = 'c42613b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index 3137d96a9..90e8cee82 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.322",
+  "version": "1.1.324",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index d89ef4fa4..9c3495d62 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -2347,9 +2347,6 @@ var PDFViewer = (function pdfViewer() {
     },
 
     _setScale: function pdfViewer_setScale(value, noScroll) {
-      if (value === 'custom') {
-        return;
-      }
       var scale = parseFloat(value);
 
       if (scale > 0) {