| 
					
				 | 
			
			
				@@ -82,9 +82,10 @@ var Toolbar = function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     value: function _bindListeners() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       var _this = this; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      var eventBus = this.eventBus; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      var eventBus = this.eventBus, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          items = this.items; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       var self = this; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      var items = this.items; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       items.previous.addEventListener('click', function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         eventBus.dispatch('previouspage'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -142,38 +143,17 @@ var Toolbar = function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     key: '_updateUIState', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     value: function _updateUIState() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      var _this2 = this; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       var resetNumPages = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (!this._wasLocalized) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      var selectScaleOption = function selectScaleOption(value, scale) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        var customScale = Math.round(scale * 10000) / 100; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        _this2.l10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%').then(function (msg) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          var options = items.scaleSelect.options; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          var predefinedValueFound = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          for (var i = 0, ii = options.length; i < ii; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            var option = options[i]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (option.value !== value) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              option.selected = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            option.selected = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            predefinedValueFound = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          if (!predefinedValueFound) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            items.customScaleOption.textContent = msg; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            items.customScaleOption.selected = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      var pageNumber = this.pageNumber; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      var pageNumber = this.pageNumber, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          pagesCount = this.pagesCount, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          items = this.items; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       var scaleValue = (this.pageScaleValue || this.pageScale).toString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       var scale = this.pageScale; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      var items = this.items; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      var pagesCount = this.pagesCount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (resetNumPages) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (this.hasPageLabels) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           items.pageNumber.type = 'text'; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -200,7 +180,24 @@ var Toolbar = function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       items.next.disabled = pageNumber >= pagesCount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       items.zoomOut.disabled = scale <= _ui_utils.MIN_SCALE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       items.zoomIn.disabled = scale >= _ui_utils.MAX_SCALE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      selectScaleOption(scaleValue, scale); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      var customScale = Math.round(scale * 10000) / 100; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.l10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%').then(function (msg) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        var options = items.scaleSelect.options; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        var predefinedValueFound = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for (var i = 0, ii = options.length; i < ii; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          var option = options[i]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          if (option.value !== scaleValue) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            option.selected = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          option.selected = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          predefinedValueFound = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (!predefinedValueFound) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          items.customScaleOption.textContent = msg; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          items.customScaleOption.selected = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     key: 'updateLoadingIndicatorState', 
			 |