Merge branch 'develop' into v1.2.2

* develop:
  Updated firebase to version 3.7.3
  Corrected jsdoc of prioritsedArray function
  Added test for eventEmitter to validate new behaviour of once()

# Conflicts:
#	package.json

Author: Manuel Overdijk

config.js

@@ -27,7 +27,7 @@ System.config({
     "famous-bkimagesurface": "github:ijzerenhein/famous-bkimagesurface@1.0.3",
     "famous-flex": "github:bizboard/famous-flex@1.3.12",
     "fastclick": "npm:fastclick@1.0.6",
-    "firebase": "github:firebase/firebase-bower@3.7.0",
+    "firebase": "github:firebase/firebase-bower@3.7.3",
     "fs": "github:jspm/nodelibs-fs@0.1.2",
     "lodash": "npm:lodash@4.13.1",
     "lodash-decorators": "npm:lodash-decorators@3.0.1",

package.json

@@ -25,7 +25,7 @@
       "famous": "github:bizboard/famous@0.3.11",
       "famous-flex": "github:bizboard/famous-flex@1.3.12",
       "fastclick": "npm:fastclick@^1.0.6",
-      "firebase": "github:firebase/firebase-bower@^3.7.0",
+      "firebase": "github:firebase/firebase-bower@^3.7.3",
       "lodash": "npm:lodash@^4.13.1",
       "lodash-decorators": "npm:lodash-decorators@^3.0.1",
       "ordered-hashmap": "npm:ordered-hashmap@^1.0.0",

src/data/PrioritisedArray.js

@@ -294,9 +294,8 @@ export class PrioritisedArray extends Array {
 
     /**
      * Return the position of model's id, saved in an associative array
-     * @param {Number} id Id field of the model we're looking for
+     * @param {String} id Id field of the model we're looking for
      * @returns {Number} Zero-based index if found, -1 otherwise
-     * @private
      */
     findIndexById(id) {
         let position = this._ids[id];

test/famous/EventEmitterSpec.js

@@ -0,0 +1,85 @@
+import _                            from 'lodash';
+import sinon                        from 'sinon';
+import chai                         from 'chai';
+import {loadDependencies,mockDOMGlobals,
+    mockDependency}                 from '../meta/TestBootstrap.js';
+
+
+let expect = chai.expect;
+let should = chai.should();
+
+describe('Event emitter', () => {
+    let imports = {};
+
+    before(() => {
+        mockDOMGlobals();
+
+        mockDependency('./src/utils/Context.js', {
+            Context: {
+                getContext: () => ({
+                    'get': () => ({child: () => ({once: () => 0})})
+                })
+            }
+        });
+
+        return loadDependencies({
+            EventEmitter: System.normalizeSync('famous/core/EventEmitter.js')
+        }).then((importedObjects) => {
+            imports = importedObjects;
+        });
+    });
+
+    describe('#constructor', () => {
+        it('constructs without exceptions', () => {
+            let eventEmitter = new imports.EventEmitter();
+            should.exist(eventEmitter);
+        });
+    });
+
+    describe('#once listener', () => {
+        it(`Makes a once() registered listener only be called once`, () => {
+            let eventEmitter= new imports.EventEmitter();
+            let run = sinon.spy();
+            eventEmitter.once('ready', run);
+            eventEmitter.emit('ready');
+            eventEmitter.emit('ready');
+            expect(run.calledOnce).to.be.true;
+        });
+
+        it(`Handles on() in combination with once() correctly`, () => {
+            let eventEmitter= new imports.EventEmitter();
+            let onceRunner = sinon.spy();
+            let onRunner = sinon.spy();
+            let secondOnRunner = sinon.spy();
+            eventEmitter.on('ready', onRunner);
+            eventEmitter.once('ready', onceRunner);
+            eventEmitter.on('ready', secondOnRunner);
+            eventEmitter.emit('ready');
+            eventEmitter.emit('ready');
+            expect(onceRunner.calledOnce).to.be.true;
+            expect(onRunner.calledTwice).to.be.true;
+            expect(secondOnRunner.calledTwice).to.be.true;
+        });
+
+        it(`Doesn't let removeListener invalidate the once() logic`, () => {
+            let eventEmitter= new imports.EventEmitter();
+            let onceRunner = sinon.spy();
+            let onRunner = sinon.spy();
+            let secondOnRunner = sinon.spy();
+            let selfRemoving = () => {
+                eventEmitter.removeListener('ready', selfRemoving);
+            };
+            eventEmitter.on('ready', selfRemoving);
+            eventEmitter.on('ready', onRunner);
+            eventEmitter.once('ready', onceRunner);
+            eventEmitter.on('ready', secondOnRunner);
+            eventEmitter.on('ready', selfRemoving);
+            eventEmitter.emit('ready');
+            eventEmitter.emit('ready');
+            expect(onceRunner.calledOnce).to.be.true;
+            expect(onRunner.calledTwice).to.be.true;
+            expect(secondOnRunner.calledTwice).to.be.true;
+        });
+    });
+
+});