Merge pull request #11 from jonataswalker/some-changes

Some changes

Author: jonataswalker

.gitignore

@@ -0,0 +1,2 @@
+/node_modules/
+/build/timestamps/

.travis.yml

@@ -1,7 +1,10 @@
+sudo: required
+dist: trusty
+
 language: node_js
 
 node_js:
-  - "4"
+  - "6"
 
 cache:
   bundler: true
@@ -16,8 +19,6 @@ before_install:
   - "if [ $(phantomjs --version) != '2.1.1' ]; then sudo ln -sf $PWD/travis-phantomjs/phantomjs-builds-2.1.1/bin/phantomjs $(which phantomjs); fi"
   - "phantomjs --version"
 
-before_script:
-  
 script:
   - xvfb-run -a make ci
 

Makefile

@@ -44,8 +44,46 @@ endef
 export HEADER
 
 # targets
+.PHONY: default
+default: help
+
+.PHONY: help
+help:
+	@echo
+	@echo "The most common targets are:"
+	@echo
+	@echo "- install                 Install node dependencies"
+	@echo "- build                   Build JavaScript and CSS files"
+	@echo "- build-watch             Build files and watch for modifications"
+	@echo "- test                    Run unit tests in the console"
+	@echo "- help                    Display this help message"
+	@echo
+	@echo "Other less frequently used targets are:"
+	@echo
+	@echo "- lint                    Check the code with the linter"
+	@echo "- build-js                Build JavaScript files"
+	@echo "- ci                      Run the full continuous integration process"
+	@echo
+
 .PHONY: ci
-ci: build test
+ci: test
+
+.PHONY: npm-install
+npm-install: install
+
+$(BUILD_DIR)/timestamps/node-modules-timestamp: package.json
+	@mkdir -p $(@D)
+	npm install
+	@touch $@
+
+.PHONY: install
+install: $(BUILD_DIR)/timestamps/node-modules-timestamp
+
+.PHONY: clean
+clean:
+	@rm -f $(BUILD_DIR)/timestamps/eslint-timestamp
+	@rm -f $(JS_FINAL)
+	@rm -f $(JS_DEBUG)
 
 .PHONY: build-watch
 build-watch: build watch
@@ -54,23 +92,30 @@ build-watch: build watch
 watch: watch-js
 
 .PHONY: build
-build: build-js
+build: install clean build-js
 
 .PHONY: build-js
 build-js: bundle-js lint uglifyjs add-js-header
 	@echo `date +'%H:%M:%S'` "Build JS ... OK"
 
 .PHONY: test
-test:
+test: build
 	@$(CASPERJS) $(CASPERJSFLAGS)
 
 .PHONY: bundle-js
 bundle-js:
 	@$(ROLLUP) $(ROLLUPFLAGS)
 
-.PHONY: lint
-lint: $(JS_DEBUG)
+$(BUILD_DIR)/timestamps/eslint-timestamp: $(SRC_DIR) \
+					  $(ROOT_DIR)/test/ \
+					  $(ROOT_DIR)/examples/
+	@mkdir -p $(@D)
+	@echo "Running eslint ..."
 	@$(ESLINT) $^
+	@touch $@
+
+.PHONY: lint
+lint: $(BUILD_DIR)/timestamps/eslint-timestamp
 
 .PHONY: uglifyjs
 uglifyjs: $(JS_DEBUG)
@@ -91,4 +136,4 @@ add-js-header: add-js-header-debug add-js-header-min
 watch-js: $(SRC_DIR)
 	@$(NODEMON) --on-change-only --watch $^ --ext js --exec "make build-js"
 
-.DEFAULT_GOAL := build
+.DEFAULT_GOAL := default

examples/example.js

@@ -1,7 +1,4 @@
-hljs.configure({
-  tabReplace: '  ',
-})
-hljs.initHighlightingOnLoad();
+/* global hljs, WatchElementResize */
 
 var size_el = document.getElementById('size');
 var size2_el = document.getElementById('size2');
@@ -10,7 +7,7 @@ var size = { x: 100, y: 80 };
 
 var watchResize = new WatchElementResize(['id', 'id2']);
 
-click_el.addEventListener('click', function() {
+click_el.addEventListener('click', function () {
   if (size.x > 180) {
     size = { x: 100, y: 80 };
 
@@ -22,18 +19,20 @@ click_el.addEventListener('click', function() {
     size.x += 40;
     size.y += 40;
   }
-  
+
   click_el.style.width = size.x + 'px';
   click_el.style.height = size.y + 'px';
 });
 
-watchResize.on('resize', function(evt) {
+watchResize.on('resize', function (evt) {
   var offset = evt.element.offset;
-  
-  if (evt.element.target.id == 'id') {
+
+  if (evt.element.target.id === 'id') {
     size_el.innerHTML = offset.width + ' x ' + offset.height;
   } else {
     size2_el.innerHTML = offset.width + ' x ' + offset.height;
   }
 });
 
+hljs.configure({ tabReplace: '  ' });
+hljs.initHighlightingOnLoad();

package.json

@@ -21,52 +21,27 @@
   },
   "keywords": [
     "resize",
+    "watch",
+    "watcher",
+    "element",
     "events"
   ],
   "devDependencies": {
     "casperjs": "^1.1.1",
     "eslint": "^3.4.0",
+    "eslint-config-jwalker": "^1.11.0",
     "nodemon": "^1.9.2",
     "rollup": "^0.36.0",
     "rollup-plugin-buble": "^0.14.0",
     "rollup-plugin-json": "^2.0.0",
     "uglify-js": "^2.6.2"
   },
   "eslintConfig": {
-    "env": {
-      "browser": true,
-      "amd": true,
-      "commonjs": true,
-      "node": false
-    },
-    "rules": {
-      "block-scoped-var": 1,
-      "dot-notation": 1,
-      "no-alert": 2,
-      "no-caller": 2,
-      "no-eval": 2,
-      "no-proto": 1,
-      "no-redeclare": 2,
-      "valid-typeof": 2,
-      "no-unreachable": 2,
-      "no-irregular-whitespace": 1,
-      "no-invalid-regexp": 1,
-      "no-func-assign": 2,
-      "no-extra-semi": 2,
-      "no-dupe-keys": 2,
-      "no-undef": 2,
-      "no-use-before-define": 2,
-      "no-unused-vars": 1,
-      "strict": [
-        1,
-        "global"
-      ],
-      "key-spacing": 0,
-      "new-cap": 1,
-      "quotes": [
-        1,
-        "single"
-      ]
+    "extends": "jwalker",
+    "globals": {
+      "casper": true,
+      "patchRequire": true,
+      "phantom": true
     }
   }
 }

src/base.js

@@ -9,26 +9,25 @@ import utils from './utils';
 export default class Base extends Emitter {
   /**
    * @constructor
-   * @param {String|Array<String>|Element|Array<Element>} target String or 
+   * @param {String|Array<String>|Element|Array<Element>} target String or
    * array of string, DOM node or array of nodes.
    * @param {Object|undefined} opt_options Options.
    */
   constructor(target, opt_options = {}) {
-    utils.assert(Array.isArray(target) ||
-                  utils.typeOf(target) == 'string' || 
-                  utils.isElement(target), 
-      '@param `target` should be Element, String or Array.');
-  
+    utils.assert(Array.isArray(target)
+        || utils.typeOf(target) === 'string'
+        || utils.isElement(target),
+        '`target` should be Element, <Array>Element, String or <Array>String.'
+    );
     super();
-
     this.target = target;
     Base.Internal = new Internal(this);
   }
-  
+
   reAddListener() {
     Base.Internal.setListener(this.target);
   }
-  
+
   removeListener() {
     Base.Internal.removeListener();
   }

src/emitter.js

@@ -3,71 +3,54 @@
  * @class Emitter
  */
 export class Emitter {
-  
   /**
    * @constructor
    */
   constructor() {
     // set events hash
     this._events = this._events || {};
-    
     // set onceEvents hash
-    this._onceEvents = this._onceEvents || {}
+    this._onceEvents = this._onceEvents || {};
   }
-  
+
   on(eventName, listener) {
-    if (!eventName || !listener) {
-      return;
-    }
+    if (!eventName || !listener) return;
     // set listeners array
     let listeners = this._events[eventName] = this._events[eventName] || [];
     // only add once
-    if (listeners.indexOf(listener) == -1) {
-      listeners.push(listener);
-    }
-    
+    if (listeners.indexOf(listener) === -1) listeners.push(listener);
     return this;
   }
-  
+
   once(eventName, listener) {
-    if (!eventName || !listener) {
-      return;
-    }
+    if (!eventName || !listener) return;
     // add event
     this.on(eventName, listener);
     // set onceListeners object
-    let onceListeners = this._onceEvents[eventName] = 
-      this._onceEvents[eventName] || {};
+    let onceListeners =
+      this._onceEvents[eventName] =
+        this._onceEvents[eventName] || {};
     // set flag
     onceListeners[listener] = true;
-    
     return this;
   }
   off(eventName, listener) {
     let listeners = this._events && this._events[eventName];
-    if (!listeners || !listeners.length) {
-      return;
-    }
+    if (!listeners || !listeners.length) return;
     const index = listeners.indexOf(listener);
-    if (index != -1) {
-      listeners.splice(index, 1);
-    }
-    
+    if (index !== -1) listeners.splice(index, 1);
     return this;
   }
-  
+
   dispatchEvent(eventName, obj = {}) {
     let listeners = this._events && this._events[eventName];
-    
-    if (!listeners || !listeners.length) {
-      return;
-    }
+    if (!listeners || !listeners.length) return;
 
     let i = 0;
     let listener = listeners[i];
     // once stuff
     const onceListeners = this._onceEvents && this._onceEvents[eventName];
-    
+
     while (listener) {
       let isOnce = onceListeners && onceListeners[listener];
       if (isOnce) {
@@ -83,7 +66,6 @@ export class Emitter {
       i += isOnce ? 0 : 1;
       listener = listeners[i];
     }
-    
     return this;
   }
 }