Merge pull request #2 from stbaer/master

removed .idea/ folder and .directory, added both to gitignore ; updated dependencies ; fixed jshint warning ; updated build
Stryzhevskyi · Jun 16, 2015 · 088b40d · 088b40d
2 parents 9baf299 + 8b3fc48
commit 088b40d
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 node_modules
+.idea/
+.directory
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/rangeSlider.iml b/.idea/rangeSlider.iml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/dist/rangeSlider.js b/dist/rangeSlider.js
@@ -270,7 +270,7 @@
             if (!isString(name)) {
                 throw new TypeError('event name must be String');
             }
-            if (!el instanceof HTMLElement) {
+            if (!(el instanceof HTMLElement)) {
                 throw new TypeError('element must be HTMLElement');
             }
             name = name.trim();
@@ -361,7 +361,7 @@
              * @this {Object} event name
              */
             function rm(listener) {
-                if(listener === instance._startEventListener){
+                if (listener === instance._startEventListener) {
                     this.el.removeEventListener(this.eventName, listener, false);
                 }
             }
@@ -603,7 +603,7 @@
             // Ok we're done fire the change event
             triggerEvent(this.element, 'change', {origin: this.identifier});
 
-            if(this.isInteractsNow || this.needTriggerEvents){
+            if (this.isInteractsNow || this.needTriggerEvents) {
                 if (this.onSlideEnd && typeof this.onSlideEnd === 'function') {
                     this.onSlideEnd(this.value, this.percent, this.position);
                 }
@@ -639,7 +639,7 @@
             this.value = value;
             this._updatePercentFromValue();
 
-            if(this.isInteractsNow || this.needTriggerEventss){
+            if (this.isInteractsNow || this.needTriggerEventss) {
                 if (this.onSlideStart && typeof this.onSlideStart === 'function' && this.onSlideEventsCount === 0) {
                     this.onSlideStart(this.value, this.percent, this.position);
                 }
@@ -766,7 +766,7 @@
          * @returns {Plugin}
          */
         Plugin.prototype.update = function (obj, triggerEvents) {
-            if(triggerEvents){
+            if (triggerEvents) {
                 this.needTriggerEvents = true;
             }
             if (isObject(obj)) {

diff --git a/dist/rangeSlider.min.css b/dist/rangeSlider.min.css
diff --git a/dist/rangeSlider.min.js b/dist/rangeSlider.min.js
diff --git a/package.json b/package.json
@@ -36,13 +36,13 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "del": "^1.1.1",
-    "gulp": "^3.8.10",
-    "gulp-jshint": "^1.9.2",
-    "gulp-minify-css": "^0.4.5",
-    "gulp-rename": "^1.2.0",
-    "gulp-uglify": "^1.1.0",
-    "gulp-watch": "^3.0.0"
+    "del": "^1.2.0",
+    "gulp": "^3.9.0",
+    "gulp-jshint": "^1.11.0",
+    "gulp-minify-css": "^1.1.6",
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^1.2.0",
+    "gulp-watch": "^4.2.4"
   },
   "scripts": {
     "test": "gulp jshint"

diff --git a/src/rangeSlider.js b/src/rangeSlider.js
@@ -270,7 +270,7 @@
             if (!isString(name)) {
                 throw new TypeError('event name must be String');
             }
-            if (!el instanceof HTMLElement) {
+            if (!(el instanceof HTMLElement)) {
                 throw new TypeError('element must be HTMLElement');
             }
             name = name.trim();
@@ -361,7 +361,7 @@
              * @this {Object} event name
              */
             function rm(listener) {
-                if(listener === instance._startEventListener){
+                if (listener === instance._startEventListener) {
                     this.el.removeEventListener(this.eventName, listener, false);
                 }
             }
@@ -603,7 +603,7 @@
             // Ok we're done fire the change event
             triggerEvent(this.element, 'change', {origin: this.identifier});
 
-            if(this.isInteractsNow || this.needTriggerEvents){
+            if (this.isInteractsNow || this.needTriggerEvents) {
                 if (this.onSlideEnd && typeof this.onSlideEnd === 'function') {
                     this.onSlideEnd(this.value, this.percent, this.position);
                 }
@@ -639,7 +639,7 @@
             this.value = value;
             this._updatePercentFromValue();
 
-            if(this.isInteractsNow || this.needTriggerEventss){
+            if (this.isInteractsNow || this.needTriggerEventss) {
                 if (this.onSlideStart && typeof this.onSlideStart === 'function' && this.onSlideEventsCount === 0) {
                     this.onSlideStart(this.value, this.percent, this.position);
                 }
@@ -766,7 +766,7 @@
          * @returns {Plugin}
          */
         Plugin.prototype.update = function (obj, triggerEvents) {
-            if(triggerEvents){
+            if (triggerEvents) {
                 this.needTriggerEvents = true;
             }
             if (isObject(obj)) {