Merge pull request chartist-js#636 from BlackPepperSoftware/develop

Fix updateCurrentOptions to expect a media query event
Waicung · Mar 11, 2016 · 537ec25 · 537ec25
2 parents 3ccd365 + 2e3685c
commit 537ec25
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/scripts/core.js b/src/scripts/core.js
@@ -942,7 +942,7 @@ var Chartist = {
       mediaQueryListeners = [],
       i;
 
-    function updateCurrentOptions(preventChangedEvent) {
+    function updateCurrentOptions(mediaEvent) {
       var previousOptions = currentOptions;
       currentOptions = Chartist.extend({}, baseOptions);
 
@@ -955,7 +955,7 @@ var Chartist = {
         }
       }
 
-      if(eventEmitter && !preventChangedEvent) {
+      if(eventEmitter && mediaEvent) {
         eventEmitter.emit('optionsChanged', {
           previousOptions: previousOptions,
           currentOptions: currentOptions
@@ -979,8 +979,8 @@ var Chartist = {
         mediaQueryListeners.push(mql);
       }
     }
-    // Execute initially so we get the correct options
-    updateCurrentOptions(true);
+    // Execute initially without an event argument so we get the correct options
+    updateCurrentOptions();
 
     return {
       removeMediaQueryListeners: removeMediaQueryListeners,