Merge pull request #45 from Xeio/bookmarks

Easier build boorkmarking and URL support
joakibj · Jan 23, 2016 · 39482a7 · 39482a7
2 parents 0d7d216 + a19db4e
commit 39482a7
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 2 deletions.
diff --git a/src/javascript/tswcalc-summary.js b/src/javascript/tswcalc-summary.js
@@ -32,6 +32,11 @@ tswcalc.summary = function() {
         updateCosts();
         updatePrimaryStats();
         updateOffensiveDefensiveStats();
+        updateURL();
+    };
+
+   var updateURL = function(event) {
+        window.location.hash = tswcalc.export.createExportUrl();
     };
 
     var collectAllStats = function() {
@@ -65,6 +70,7 @@ tswcalc.summary = function() {
         el.pantheon_cost.html(pantheons);
         el.criterion_upgrade_cost.html(criterionUpgrades);
         el.astral_fuse_cost.html(astralFuses);
+        updateURL();
     };
 
     var updatePrimaryStats = function() {
@@ -75,6 +81,7 @@ tswcalc.summary = function() {
                 updateOnePrimaryStat(stat, sums[stat]);
             }
         }
+        updateURL();
     };
 
     var updateOnePrimaryStat = function(stat, value) {
@@ -149,6 +156,7 @@ tswcalc.summary = function() {
         updateGlyphValues();
         updateStats(sums);
         updateCosts();
+        updateURL();
     };
 
     var collectOffensiveDefensiveStats = function() {

diff --git a/test/buttonbar.html b/test/buttonbar.html
@@ -15,9 +15,11 @@
   <script src="../src/javascript/data/tswcalc-data-signets.js"></script>
   <script src="../src/javascript/data/tswcalc-data-glyphs.js"></script>
   <script src="../src/javascript/data/tswcalc-data-costs.js"></script>
+  <script src="../src/javascript/data/tswcalc-data-mappings.js"></script>
   <script src="../src/javascript/data/tswcalc-data-gear.js"></script>
   <script src="../src/javascript/data/tswcalc-data-nyraid.js"></script>
   <script src="../src/javascript/data/tswcalc-data-consumables.js"></script>
+  <script src="../src/javascript/tswcalc-export.js"></script>
   <script src="../src/javascript/tswcalc-buttons.js"></script>
   <script src="../src/javascript/tswcalc-buttonbar.js"></script>
   <script src="../src/javascript/tswcalc-summary.js"></script>

diff --git a/test/buttons.html b/test/buttons.html
@@ -18,6 +18,7 @@
   <script src="../src/javascript/data/tswcalc-data-costs.js"></script>
   <script src="../src/javascript/data/tswcalc-data-mappings.js"></script>
   <script src="../src/javascript/data/tswcalc-data-consumables.js"></script>
+  <script src="../src/javascript/tswcalc-export.js"></script>
   <script src="../src/javascript/tswcalc-miscslot.js"></script>
   <script src="../src/javascript/tswcalc-summary.js"></script>
   <script src="../src/javascript/tswcalc-buttons.js"></script>

diff --git a/test/checkbox.html b/test/checkbox.html
@@ -19,12 +19,14 @@
   <script src="../src/javascript/data/tswcalc-data-mappings.js"></script>
   <script src="../src/javascript/data/tswcalc-data-nyraid.js"></script>
   <script src="../src/javascript/data/tswcalc-data-consumables.js"></script>
+  <script src="../src/javascript/tswcalc-export.js"></script>
   <script src="../src/javascript/tswcalc-miscslot.js"></script>
   <script src="../src/javascript/tswcalc-summary.js"></script>
   <script src="../src/javascript/tswcalc-buttons.js"></script>
   <script src="../src/javascript/tswcalc-selects.js"></script>
   <script src="../src/javascript/tswcalc-slots.js"></script>
   <script src="../src/javascript/tswcalc-checkbox.js"></script>
+  <script src="../src/javascript/tswcalc-buttonbar.js"></script>
   <script src="qunit/qunit-1.11.0.js"></script>
   <script src="test-common.js"></script>
   <script src="checkbox.js"></script>

diff --git a/test/checkbox.js b/test/checkbox.js
@@ -1,8 +1,11 @@
 
 module('checkbox-integration-tests', {
     setup: function() {
+        renderButtonbar();
         renderSlots();
+        initiateButtonHandlers();
         initiateSelectHandlers();
+        initiateRaidCheckboxes();
         initiateSummary();
         tswcalc.checkbox['head'] = new tswcalc.checkbox.RaidCheckbox('head');
         tswcalc.checkbox['head'].initiate();

diff --git a/test/import.html b/test/import.html
@@ -19,6 +19,7 @@
   <script src="../src/javascript/data/tswcalc-data-mappings.js"></script>
   <script src="../src/javascript/data/tswcalc-data-nyraid.js"></script>
   <script src="../src/javascript/data/tswcalc-data-consumables.js"></script>
+  <script src="../src/javascript/tswcalc-export.js"></script>
   <script src="../src/javascript/tswcalc-miscslot.js"></script>
   <script src="../src/javascript/tswcalc-summary.js"></script>
   <script src="../src/javascript/tswcalc-buttons.js"></script>

diff --git a/test/selects.html b/test/selects.html
@@ -17,15 +17,19 @@
   <script src="../src/javascript/data/tswcalc-data-nyraid.js"></script>
   <script src="../src/javascript/data/tswcalc-data-glyphs.js"></script>
   <script src="../src/javascript/data/tswcalc-data-costs.js"></script>
+  <script src="../src/javascript/data/tswcalc-data-mappings.js"></script>
   <script src="../src/javascript/data/tswcalc-data-gear.js"></script>
   <script src="../src/javascript/data/tswcalc-data-cadoro.js"></script>
   <script src="../src/javascript/data/tswcalc-data-consumables.js"></script>
+  <script src="../src/javascript/tswcalc-export.js"></script>
   <script src="../src/javascript/tswcalc-miscslot.js"></script>
   <script src="../src/javascript/tswcalc-selects.js"></script>
   <script src="../src/javascript/tswcalc-summary.js"></script>
   <script src="../src/javascript/tswcalc-checkbox.js"></script>
   <script src="../src/javascript/tswcalc-slots.js"></script>
   <script src="../src/javascript/tswcalc-util.js"></script>
+  <script src="../src/javascript/tswcalc-buttonbar.js"></script>
+  <script src="../src/javascript/tswcalc-buttons.js"></script>
   <script src="qunit/qunit-1.11.0.js"></script>
   <script src="test-common.js"></script>
   <script src="selects.js"></script>

diff --git a/test/selects.js b/test/selects.js
@@ -48,8 +48,11 @@ test('should have required event listeners for change on selects in the DOM', 61
 
 module('selects-unit-tests', {
     setup: function() {
+        renderButtonbar();
         renderSlots();
         initiateSelectHandlers();
+        initiateRaidCheckboxes();
+        initiateSummary();
     }
 });
 
@@ -71,11 +74,12 @@ test('should get signets for head', 1, function() {
 
 module('selects-integration-tests', {
     setup: function() {
+        renderButtonbar();
         renderSlots();
-        tswcalc.slots.init();
+        initiateButtonHandlers();
         initiateSelectHandlers();
         initiateRaidCheckboxes();
-        initiateSummary();
+        tswcalc.slots.init();
     }
 });
 

diff --git a/test/slots.html b/test/slots.html
@@ -18,6 +18,7 @@
   <script src="../src/javascript/data/tswcalc-data-costs.js"></script>
   <script src="../src/javascript/data/tswcalc-data-mappings.js"></script>
   <script src="../src/javascript/data/tswcalc-data-consumables.js"></script>
+  <script src="../src/javascript/tswcalc-export.js"></script>
   <script src="../src/javascript/tswcalc-miscslot.js"></script>
   <script src="../src/javascript/tswcalc-summary.js"></script>
   <script src="../src/javascript/tswcalc-buttons.js"></script>

diff --git a/test/summary.html b/test/summary.html
@@ -16,8 +16,10 @@
   <script src="../src/javascript/data/tswcalc-data-glyphs.js"></script>
   <script src="../src/javascript/data/tswcalc-data-gear.js"></script>
   <script src="../src/javascript/data/tswcalc-data-costs.js"></script>
+  <script src="../src/javascript/data/tswcalc-data-mappings.js"></script>
   <script src="../src/javascript/data/tswcalc-data-nyraid.js"></script>
   <script src="../src/javascript/data/tswcalc-data-consumables.js"></script>
+  <script src="../src/javascript/tswcalc-export.js"></script>
   <script src="../src/javascript/tswcalc-summary.js"></script>
   <script src="../src/javascript/tswcalc-buttons.js"></script>
   <script src="../src/javascript/tswcalc-selects.js"></script>