Polyfill Promise properly

h/static/scripts/annotator/guest.coffee

 raf = require('raf')
-Promise = global.Promise ? require('es6-promise').Promise
 Annotator = require('annotator')
 $ = Annotator.$
 

h/static/scripts/annotator/main.js

@@ -8,6 +8,8 @@ require('jquery-scrollintoview')
 var g = Annotator.Util.getGlobal();
 if (g.wgxpath) g.wgxpath.install();
 
+require('es6-promise')
+
 var nodeIteratorShim = require('node-iterator-shim')
 nodeIteratorShim();
 

h/static/scripts/annotator/plugin/pdf.coffee

 extend = require('extend')
-Promise = global.Promise ? require('es6-promise').Promise
 Annotator = require('annotator')
 
 

h/static/scripts/annotator/test/guest-test.coffee

 raf = require('raf')
-Promise = global.Promise ? require('es6-promise').Promise
 Annotator = require('annotator')
 Guest = require('../guest')
 anchoring = require('../anchoring/html')

h/static/scripts/karma.config.js

@@ -36,6 +36,7 @@ module.exports = function(config) {
       'vendor/moment-timezone.js',
       'vendor/moment-timezone-data.js',
       'vendor/polyfills/url.js',
+      '../../../node_modules/es6-promise/dist/es6-promise.js',
 
       // Test deps
       'vendor/angular-mocks.js',

h/static/scripts/test/annotation-mapper-test.coffee

-Promise = global.Promise ? require('es6-promise').Promise
 {module, inject} = require('angular-mock')
 
 assert = chai.assert