Merge pull request #11 from mark100net/json-parse-fix

allow for jquery automatically converting data to JSON #10
Zettersten · Dec 30, 2014 · d0b4fbd · d0b4fbd
2 parents 437350d + e26abe0
commit d0b4fbd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/jquery.gracket.js b/jquery.gracket.js
@@ -33,7 +33,9 @@
     // global
     var 
       container = this,
-      data = (typeof container.data("gracket") === "undefined") ? [] : JSON.parse(container.data("gracket")),
+      data = (typeof container.data("gracket") === "undefined") ? [] :
+                (typeof container.data("gracket") === "string") ? JSON.parse(container.data("gracket")) :
+                    container.data("gracket"),
       team_count,
       round_count,
       game_count,

diff --git a/jquery.gracket.min.js b/jquery.gracket.min.js