Merge pull request #5 from smcclstocks/master

fixes #4
xomaczar · Aug 17, 2015 · b27e0e5 · b27e0e5
2 parents 9909de5 + 5510b72
commit b27e0e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/addon/ember-ion-rangeslider.js b/addon/ember-ion-rangeslider.js
@@ -14,13 +14,21 @@ export default Ember.Component.extend(IonSlider, {
     //## Update trigger: change|finish
     var updateTrigger = get(this, 'updateTrigger') || 'finish',
         throttleTimeout = get(this, 'throttleTimeout') || 50,
+        to = get(this, 'to'),
+        from = get(this, 'from'),
         options = {
-          to: get(this, 'to') || 10,
-          from: get(this, 'from') || 100,
+          to: 10,
+          from: 100,
           onChange: Ember.K,
           onFinish: Ember.run.bind(this, '_sliderDidFinish'),
         };
 
+    if (from || from === 0) {
+      options.from = from
+    }
+    if (to || to === 0) {
+      options.to = to
+    }
     //## Setup change update trigger
     if (updateTrigger === 'change') {
       options.onChange = Ember.run.bind(this, '_sliderDidChange', throttleTimeout);
@@ -53,7 +61,7 @@ export default Ember.Component.extend(IonSlider, {
       //## In case where multiple sliders bound to the same property
       //## don't update the active slider values (to/from) as it results in a
       //## a loss of focus in a currently active slider
-      if(!this._slider.is_active){
+      if(this._slider && !this._slider.is_active){
         this._slider.update(this.getProperties(propName));
       }
   }),

diff --git a/addon/mixins/ion-slider.js b/addon/mixins/ion-slider.js
@@ -21,7 +21,7 @@ var ionProperties = {
     to_shadow          : false,
 
     prettify_enabled   : true,
-    prettify_seperator : ' ',
+    prettify_separator : ' ',
     prettify           : null,
 
     force_edges        : false,