Merge pull request #98 from wacii/client-2.9.0

update client to 2.9.0 and drop-in to 1.7.0
highfidelity · Jul 22, 2015 · 5e6e38c · 5e6e38c
2 parents 5cd6594 + b749832
commit 5e6e38c
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 57 deletions.
diff --git a/asset_versions.yml b/asset_versions.yml
@@ -1,3 +1,3 @@
 ---
-client_version: 2.8.0
-dropin_version: 1.6.0
+client_version: 2.9.0
+dropin_version: 1.7.0
diff --git a/lib/fake_braintree/braintree_assets/dropin/1.6.0/braintree-dropin-internal.min.js b/lib/fake_braintree/braintree_assets/dropin/1.6.0/braintree-dropin-internal.min.js
diff --git a/lib/fake_braintree/braintree_assets/dropin/1.7.0/braintree-dropin-internal.min.js b/lib/fake_braintree/braintree_assets/dropin/1.7.0/braintree-dropin-internal.min.js
diff --git a/..._assets/dropin/1.6.0/braintree-dropin.css → ..._assets/dropin/1.7.0/braintree-dropin.css b/..._assets/dropin/1.6.0/braintree-dropin.css → ..._assets/dropin/1.7.0/braintree-dropin.css
@@ -83,13 +83,13 @@ img {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 0;
     height: 28px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.coinbase {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 0;
         height: 28px;
         width: 44px;
@@ -101,13 +101,13 @@ img {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -72px;
     height: 29px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.paypal {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -212px;
         height: 29px;
         width: 44px;
@@ -119,13 +119,13 @@ img {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -231px;
     height: 28px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.visa {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -184px;
         height: 28px;
         width: 44px;
@@ -137,13 +137,13 @@ img {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -203px;
     height: 28px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.master-card {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -128px;
         height: 28px;
         width: 44px;
@@ -155,13 +155,13 @@ img {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -119px;
     height: 28px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.american-express {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -72px;
         height: 28px;
         width: 44px;
@@ -173,31 +173,49 @@ img {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -259px;
     height: 28px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.diners-club {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -259px;
         height: 28px;
         width: 44px;
         -webkit-background-size: 86px auto;
         -moz-background-size: 86px auto;
         -o-background-size: 86px auto;
         background-size: 86px auto; } }
+  .payment-method-icon.maestro {
+    background-repeat: no-repeat;
+    display: block;
+    text-indent: -999em;
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
+    background-position: 0 -147px;
+    height: 28px;
+    width: 44px; }
+    @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
+      .payment-method-icon.maestro {
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
+        background-position: 0 -156px;
+        height: 28px;
+        width: 44px;
+        -webkit-background-size: 86px auto;
+        -moz-background-size: 86px auto;
+        -o-background-size: 86px auto;
+        background-size: 86px auto; } }
   .payment-method-icon.discover {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -287px;
     height: 28px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.discover {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -287px;
         height: 28px;
         width: 44px;
@@ -209,13 +227,13 @@ img {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -175px;
     height: 28px;
     width: 44px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .payment-method-icon.jcb {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -100px;
         height: 28px;
         width: 44px;
@@ -231,13 +249,13 @@ img {
   background-repeat: no-repeat;
   display: block;
   text-indent: -999em;
-  background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+  background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
   background-position: 0 -343px;
   height: 28px;
   width: 44px; }
   @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
     .cvv-label .payment-method-icon#cvv-icon {
-      background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+      background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
       background-position: 0 -343px;
       height: 28px;
       width: 44px;
@@ -249,13 +267,13 @@ img {
   background-repeat: no-repeat;
   display: block;
   text-indent: -999em;
-  background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+  background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
   background-position: 0 -315px;
   height: 28px;
   width: 44px; }
   @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
     .cvv-label .payment-method-icon#cid-icon {
-      background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+      background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
       background-position: 0 -315px;
       height: 28px;
       width: 44px;
@@ -1984,14 +2002,14 @@ button#coinbase-container {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -421px;
     height: 16px;
     width: 79px;
     margin: 0 auto; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       button#coinbase-container .coinbase-button-logo {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -421px;
         height: 16px;
         width: 79px;
@@ -2041,15 +2059,15 @@ button.paypal {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -399px;
     height: 22px;
     width: 61px;
     display: inline-block;
     margin: 8px auto 0; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       button.paypal .paypal-button-logo {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -371px;
         height: 22px;
         width: 61px;
@@ -4204,7 +4222,7 @@ button.paypal {
     background-repeat: no-repeat;
     display: block;
     text-indent: -999em;
-    background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
+    background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
     background-position: 0 -101px;
     height: 18px;
     width: 18px;
@@ -4213,7 +4231,7 @@ button.paypal {
     margin-bottom: -2px; }
     @media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
       .server-error .error-icon {
-        background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
+        background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
         background-position: 0 -241px;
         height: 18px;
         width: 18px;

diff --git a/...ts/dropin/1.6.0/images/2x-sf9a66b4f5a.png → ...ts/dropin/1.7.0/images/2x-sf9a66b4f5a.png b/...ts/dropin/1.6.0/images/2x-sf9a66b4f5a.png → ...ts/dropin/1.7.0/images/2x-sf9a66b4f5a.png
diff --git a/...ree_assets/dropin/1.6.0/inline-frame.html → ...ree_assets/dropin/1.7.0/inline-frame.html b/...ree_assets/dropin/1.6.0/inline-frame.html → ...ree_assets/dropin/1.7.0/inline-frame.html
@@ -5,9 +5,9 @@
   <head>
     <title>Cards</title>
     <meta charset="UTF-8">
-    <link href="/dropin/1.6.0/vendor/normalize.css" rel="stylesheet">
-    <link href="/dropin/1.6.0/braintree-dropin.css" rel="stylesheet">
-    <script src="/dropin/1.6.0/vendor/modernizr.js"></script>
+    <link href="/dropin/1.7.0/vendor/normalize.css" rel="stylesheet">
+    <link href="/dropin/1.7.0/braintree-dropin.css" rel="stylesheet">
+    <script src="/dropin/1.7.0/vendor/modernizr.js"></script>
   </head>
   <body class="inline-frame is-loading initial-inline-frame-loading">
     <div id="container">
@@ -35,9 +35,9 @@
       <button class="cancel-popup-button">Cancel PayPal Login</button>
     </div>
 
-    <!--[if LT IE  9]><script src="/dropin/1.6.0/vendor/jquery-1.11.0.js"></script><![endif]-->
-    <!--[if gte IE 9]><!--><script src="/dropin/1.6.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
-    <script src="/dropin/1.6.0/braintree-dropin-internal.min.js"></script>
+    <!--[if LT IE  9]><script src="/dropin/1.7.0/vendor/jquery-1.11.0.js"></script><![endif]-->
+    <!--[if gte IE 9]><!--><script src="/dropin/1.7.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
+    <script src="/dropin/1.7.0/braintree-dropin-internal.min.js"></script>
     <script>
       var inlineFrame = new braintree.dropin.InlineFrame.Manager({
         container: document.getElementById("container")

diff --git a/...tree_assets/dropin/1.6.0/modal-frame.html → ...tree_assets/dropin/1.7.0/modal-frame.html b/...tree_assets/dropin/1.6.0/modal-frame.html → ...tree_assets/dropin/1.7.0/modal-frame.html
@@ -5,16 +5,16 @@
   <head>
     <title>Modal</title>
     <meta charset="UTF-8">
-    <link href="/dropin/1.6.0/vendor/normalize.css" rel="stylesheet">
-    <link href="/dropin/1.6.0/braintree-dropin.css" rel="stylesheet">
-    <script src="/dropin/1.6.0/vendor/modernizr.js"></script>
+    <link href="/dropin/1.7.0/vendor/normalize.css" rel="stylesheet">
+    <link href="/dropin/1.7.0/braintree-dropin.css" rel="stylesheet">
+    <script src="/dropin/1.7.0/vendor/modernizr.js"></script>
   </head>
   <body class="modal-frame">
     <div id="container"></div>
     <div class="modal-wrap"></div>
-    <!--[if LT IE  9]><script src="/dropin/1.6.0/vendor/jquery-1.11.0.js"></script><![endif]-->
-    <!--[if gte IE 9]><!--><script src="/dropin/1.6.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
-    <script src="/dropin/1.6.0/braintree-dropin-internal.min.js"></script>
+    <!--[if LT IE  9]><script src="/dropin/1.7.0/vendor/jquery-1.11.0.js"></script><![endif]-->
+    <!--[if gte IE 9]><!--><script src="/dropin/1.7.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
+    <script src="/dropin/1.7.0/braintree-dropin-internal.min.js"></script>
     <script>
       var modalFrame = new braintree.dropin.ModalFrame({
         container: document.getElementById("container")

diff --git a/...ssets/dropin/1.6.0/vendor/jquery-2.1.0.js → ...ssets/dropin/1.7.0/vendor/jquery-2.1.0.js b/...ssets/dropin/1.6.0/vendor/jquery-2.1.0.js → ...ssets/dropin/1.7.0/vendor/jquery-2.1.0.js
diff --git a/...e_assets/dropin/1.6.0/vendor/modernizr.js → ...e_assets/dropin/1.7.0/vendor/modernizr.js b/...e_assets/dropin/1.6.0/vendor/modernizr.js → ...e_assets/dropin/1.7.0/vendor/modernizr.js
diff --git a/..._assets/dropin/1.6.0/vendor/normalize.css → ..._assets/dropin/1.7.0/vendor/normalize.css b/..._assets/dropin/1.6.0/vendor/normalize.css → ..._assets/dropin/1.7.0/vendor/normalize.css
diff --git a/spec/dummy/public/braintree.js b/spec/dummy/public/braintree.js