Merge pull request #5456 from spalger/fix/promiseCompat

[promise/Constructor] remove non-standard `defer` arg

src/ui/public/courier/data_source/_abstract.js

@@ -121,7 +121,10 @@ define(function (require) {
     SourceAbstract.prototype.onResults = function (handler) {
       var self = this;
 
-      return new PromiseEmitter(function (resolve, reject, defer) {
+      return new PromiseEmitter(function (resolve, reject) {
+        const defer = Promise.defer();
+        defer.promise.then(resolve, reject);
+
         self._createRequest(defer);
       }, handler);
     };
@@ -142,7 +145,10 @@ define(function (require) {
     SourceAbstract.prototype.onError = function (handler) {
       var self = this;
 
-      return new PromiseEmitter(function (resolve, reject, defer) {
+      return new PromiseEmitter(function (resolve, reject) {
+        const defer = Promise.defer();
+        defer.promise.then(resolve, reject);
+
         errorHandlers.push({
           source: self,
           defer: defer

src/ui/public/promises/__tests__/promises.js

@@ -12,6 +12,16 @@ describe('Promise service', function () {
     $rootScope = $injector.get('$rootScope');
   }));
 
+  describe('Constructor', function () {
+    it('provides resolve and reject function', function () {
+      new Promise(function (resolve, reject) {
+        expect(resolve).to.be.a('function');
+        expect(reject).to.be.a('function');
+        expect(arguments).to.have.length(2);
+      });
+    });
+  });
+
   describe('Promise.fromNode', function () {
     it('creates a callback that controls a promise', function () {
       let callback;

src/ui/public/promises/promises.js

@@ -11,7 +11,7 @@ define(function (require) {
 
       var defer = $q.defer();
       try {
-        fn(defer.resolve, defer.reject, defer);
+        fn(defer.resolve, defer.reject);
       } catch (e) {
         defer.reject(e);
       }