Merge pull request #89 from adobe-webplatform/version-1.7.0

Version 1.7.0
adobe · Jul 5, 2016 · 16707d5 · 16707d5
2 parents 66d571b + 80f0e5c
commit 16707d5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -66,4 +66,5 @@ Code is minified using: http://marijnhaverbeke.nl/uglifyjs
 * v 1.3.x - Debounce resizing events, more accurate space width estimate
 * v 1.4.0 - Add support for nested tags (rileyjshaw)
 * v 1.5.0 - Re-balance text on resize for manually triggered selectors (rileyjshaw)
-* v 1.6.0 - Add balanceTextUpdate() method (rileyjshaw)
+* v 1.6.x - Add balanceTextUpdate() method (rileyjshaw), bug fixes (bfred-it)
+* v 1.7.0 - Hack for partially working with jQuery 3, remove deprecation warning
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "balance-text",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "authors": [
     "Adobe Systems, Inc. <https://github.com/adobe-webplatform>"
   ],
@@ -14,6 +14,6 @@
   "license": "Apache License, Version 2.0",
   "homepage": "https://github.com/adobe-webplatform/balance-text",
   "dependencies": {
-    "jquery": "~1.8.0"
+    "jquery": "1.9.1 - 3"
   }
 }
diff --git a/jquery.balancetext.min.js b/jquery.balancetext.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "balance-text",
-    "version": "1.6.2",
+    "version": "1.7.0",
     "filename": "jquery.balancetext.min.js",
     "homepage": "https://github.com/adobe-webplatform/balance-text",
     "description": "A jQuery plugin for implementing balancing of text across lines in a web page",

diff --git a/sample/jquery-1.8.0.min.js b/sample/jquery-1.8.0.min.js
diff --git a/test/jquery-1.8.0.min.js b/test/jquery-1.8.0.min.js