Print Preview: Fixing the behavior of increment/decrement buttons, destinations drop-down list.

BUG=83257, 83259, 82953
TEST=See bug description.

Review URL: http://codereview.chromium.org/7040017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86137 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 23 insertions, 16 deletions

diff --git a/chrome/browser/resources/print_preview.css b/chrome/browser/resources/print_preview.css
index f6dd58c..c0eaaa9 100644
--- a/chrome/browser/resources/print_preview.css
+++ b/chrome/browser/resources/print_preview.css
@@ -498,9 +498,9 @@ select {
   -webkit-padding-end: 34px;
   -webkit-padding-start: 14px;
   -webkit-user-select: none;
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAHCAYAAADqF3ZBAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEtJREFUeNpi/P//PwO1AAuIYGRkJGgi0FJGQmqYoAobCRjUSJTTQN6E4gYQFx2DxJHU4MXoAg3kGoTNMLiBpBqEyzAGcgwCYYAAAwBwTuKv+cnjcAAAAABJRU5ErkJggg==),
+  background-image: url('./print_preview/black_arrow.png'),
                     -webkit-linear-gradient(#fafafa, #dcdcdc);
-  background-position: 100% 50%, left top;
+  background-position: 95% 55%, left top;
   background-repeat: no-repeat, repeat;
   border-radius: 3px;
   border: 1px solid #a0a0a0;
@@ -514,19 +514,19 @@ select {
 }
 
 html[dir='rtl'] select {
-  background-position: 5% 50%, right top;
+  background-position: 5% 55%, right top;
 }
 
 select:disabled,
 select.disabled {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAHCAYAAADqF3ZBAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAE9JREFUeNpi/P//PwO1ACPIsMbGRoIm1tfXMxJSwwRV2EjAoEZiXAY2DOiyBlwaQOIgeaINw2UgKQahGIZuIKkGgQEoArDgBhzieDFAgAEAkxBfTunDjHwAAAAASUVORK5CYII=),
+  background-image: url('./print_preview/gray_arrow.png'),
                     -webkit-linear-gradient(#fafafa, #dcdcdc);
 }
 
 select:not(:disabled):not(.disabled):hover {
   -webkit-box-shadow: inset 0 1px 2px white,
                       0 2px 4px rgba(0, 0, 0, .2);
-  background-image: url(_images/combo-box-triangle.png),
+  background-image: url('./print_preview/black_arrow.png'),
                     -webkit-linear-gradient(#fff, #e6e6e6);
   text-shadow: 0 1px 0 rgba(255, 255, 255, 1);
 }
diff --git a/chrome/browser/resources/print_preview.html b/chrome/browser/resources/print_preview.html
index d8b280f..e33b87d 100644
--- a/chrome/browser/resources/print_preview.html
+++ b/chrome/browser/resources/print_preview.html
@@ -53,8 +53,8 @@
           <h1 i18n-content="copiesLabel"></h1>
           <div>
             <div>
-              <input id="copies" type="text" name="copies" value="1" min=1"
-                  max="999" class="number small" placeholder="1"/>
+              <input id="copies" type="text" name="copies" value="1" min="1"
+                  max="999" maxlength="3" class="number small"/>
               <button id="increment">+</button>
               <button id="decrement">–</button>
               <span id="collate-option" hidden>
diff --git a/chrome/browser/resources/print_preview.js b/chrome/browser/resources/print_preview.js
index 3b0d99a..f917253 100644
--- a/chrome/browser/resources/print_preview.js
+++ b/chrome/browser/resources/print_preview.js
@@ -585,16 +585,17 @@ function pageRangesFieldChanged() {
  * 'copies' value.
  */
 function updateCopiesButtonsState() {
+  var copiesField = $('copies');
   if (!isNumberOfCopiesValid()) {
-    $('copies').classList.add('invalid');
-    $('increment').disabled = true;
-    $('decrement').disabled = true;
+    copiesField.classList.add('invalid');
+    $('increment').disabled = false;
+    $('decrement').disabled = false;
     showInvalidHint($('copies-hint'));
   }
   else {
-    $('copies').classList.remove('invalid');
-    $('increment').disabled = false;
-    $('decrement').disabled = false;
+    copiesField.classList.remove('invalid');
+    $('increment').disabled = (getCopies() == copiesField.max) ? true : false;
+    $('decrement').disabled = (getCopies() == copiesField.min) ? true : false;
     hideInvalidHint($('copies-hint'));
   }
 }
@@ -892,9 +893,15 @@ function areArraysEqual(array1, array2) {
  * Executed when the 'increment' or 'decrement' button is clicked.
  */
 function onCopiesButtonsClicked(sign) {
-  if($('copies').value == 1 && (sign == -1))
-    return;
-  $('copies').value = getCopies() + sign * 1;
+  var copiesField = $('copies');
+  if (!isNumberOfCopiesValid())
+    copiesField.value = 1;
+  else {
+    var newValue = getCopies() + sign * 1;
+    if (newValue < copiesField.min || newValue > copiesField.max)
+      return;
+    copiesField.value = newValue;
+  }
   copiesFieldChanged();
 }