Merge pull request #338 from girder/geojs-0.19.1

Update to work with geojs 0.19.1.

Author: manthey

plugin.json

@@ -10,7 +10,7 @@
         "dependencies": {
             "d3": "^3.5.16",
             "hammerjs": "^2.0.8",
-            "geojs": "^0.19.0",
+            "geojs": "^0.19.1",
             "slideatlas-viewer": "4.0.3",
             "sinon": "^2.1.0",
             "tinycolor2": "^1.4.1"

plugin_tests/client/annotationListSpec.js

@@ -24,7 +24,7 @@ describe('AnnotationListWidget', function () {
     });
 
     describe('setup', function () {
-        it('mock VGL', function () {
+        it('mock Webgl', function () {
             var GeojsViewer = largeImage.views.imageViewerWidget.geojs;
             girder.utilities.PluginUtils.wrap(GeojsViewer, 'initialize', function (initialize) {
                 this.drawAnnotation = function (annotation) {
@@ -35,7 +35,7 @@ describe('AnnotationListWidget', function () {
                 };
 
                 this.once('g:beforeFirstRender', function () {
-                    window.geo.util.mockVGLRenderer();
+                    window.geo.util.mockWebglRenderer();
                 });
                 initialize.apply(this, _.rest(arguments));
             });

plugin_tests/client/geojsSpec.js

@@ -107,7 +107,7 @@ $(function () {
                 hoverEvents: true
             });
             viewer.once('g:beforeFirstRender', function () {
-                window.geo.util.mockVGLRenderer();
+                window.geo.util.mockWebglRenderer();
             });
             waitsFor(function () {
                 return $('.geojs-layer.active').length >= 1;
@@ -708,7 +708,7 @@ $(function () {
                 scale: {position: {bottom: 20, right: 10}, scale: 0.0005}
             });
             viewer.once('g:beforeFirstRender', function () {
-                window.geo.util.mockVGLRenderer();
+                window.geo.util.mockWebglRenderer();
             });
             waitsFor(function () {
                 return $('.geojs-layer.active').length >= 1 && viewer.scaleWidget;

plugin_tests/client/imageViewerSpec.js

@@ -6,12 +6,12 @@ girderTest.startApp();
 
 $(function () {
     describe('setup', function () {
-        it('mock VGL', function () {
+        it('mock Webgl', function () {
             var girder = window.girder;
             var GeojsViewer = girder.plugins.large_image.views.imageViewerWidget.geojs;
             girder.utilities.PluginUtils.wrap(GeojsViewer, 'initialize', function (initialize) {
                 this.once('g:beforeFirstRender', function () {
-                    window.geo.util.mockVGLRenderer();
+                    window.geo.util.mockWebglRenderer();
                 });
                 initialize.apply(this, _.rest(arguments));
             });