Merge pull request #8 from brewster1134/form_val_priority

form_val_priority
brewster1134 · Sep 23, 2016 · f1f1829 · f1f1829
2 parents 1e55805 + 2371bdf
commit f1f1829
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 110 deletions.
diff --git a/.hound.yml b/.hound.yml
@@ -0,0 +1,2 @@
+jshint:
+  enabled: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+###### 1.0.10
+* form element values take precedence over other attributes
+
 ###### 1.0.9
 * support for a delay option
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    sass (3.4.13)
+    sass (3.4.22)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   sass (~> 3.4)
+
+BUNDLED WITH
+   1.12.5
diff --git a/README.md b/README.md
@@ -125,10 +125,10 @@ It will track the first value it finds from the following:
 ---
 #### `_value`
   * `data-atrackt-value`  A custom value to explicitly set
+  * `val`               The value (if a form element)
   * `title`             The value of the title attribute
   * `name`              The value of the name attribute
   * `text`              The text value of the element. This contains only text and will not include any HTML.
-  * `val`               The value (if a form element)
   * `id`                The value of the id attribute
   * `class`             The value of the class attribute
 

diff --git a/bower.json b/bower.json
@@ -1,15 +1,15 @@
 {
   "name": "atrackt",
   "dependencies": {
-    "jquery": "~2",
-    "jquery.scrollTo": "~1"
+    "jquery": "*",
+    "jquery.scrollTo": "*"
   },
   "devDependencies": {
-    "chai": "~1",
-    "chai-as-promised": "~4",
-    "mocha": "~1",
-    "sinon": "~1",
-    "sinon-chai": "~2",
-    "lolex": "sinonjs/lolex#~1"
+    "chai": "*",
+    "chai-as-promised": "*",
+    "mocha": "*",
+    "sinon": "*",
+    "sinon-chai": "*",
+    "lolex": "sinonjs/lolex"
   }
 }
diff --git a/demo/atrackt_demo.js b/demo/atrackt_demo.js
diff --git a/lib/atrackt.console.js b/lib/atrackt.console.js