Merge branch 'master' of github.com:openseadragon/openseadragon

src/iiiftilesource.js

@@ -444,8 +444,11 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea
     /**
      * Determine whether arbitrary tile requests can be made against a service with the given profile
      * @function
-     * @param {array} profile - IIIF profile array
-     * @throws {Error}
+     * @param {Object} options
+     * @param {Array|String} options.profile
+     * @param {Number} options.version
+     * @param {String} options.extraFeatures
+     * @returns {Boolean}
      */
     function canBeTiled ( options ) {
         var level0Profiles = [

src/openseadragon.js

@@ -2313,7 +2313,7 @@ function OpenSeadragon( options ){
                           protocol !== "https:" )) {
                         onSuccess( request );
                     } else {
-                        $.console.log( "AJAX request returned %d: %s", request.status, url );
+                        $.console.error( "AJAX request returned %d: %s", request.status, url );
 
                         if ( $.isFunction( onError ) ) {
                             onError( request );
@@ -2343,7 +2343,7 @@ function OpenSeadragon( options ){
 
                 request.send(null);
             } catch (e) {
-                $.console.log( "%s while making AJAX request: %s", e.name, e.message );
+                $.console.error( "%s while making AJAX request: %s", e.name, e.message );
 
                 request.onreadystatechange = function(){};
 

src/referencestrip.js

@@ -267,7 +267,7 @@ $.ReferenceStrip.prototype = {
      */
     update: function () {
         if ( THIS[this.id].animating ) {
-            $.console.log( 'image reference strip update' );
+            // $.console.log( 'image reference strip update' );
             return true;
         }
         return false;

src/strings.js

@@ -83,7 +83,7 @@ $.extend( $, /** @lends OpenSeadragon */{
         string = container[ props[ i ] ];
 
         if ( typeof ( string ) !== "string" ) {
-            $.console.log( "Untranslated source string:", prop );
+            $.console.error( "Untranslated source string:", prop );
             string = ""; // FIXME: this breaks gettext()-style convention, which would return source
         }
 

src/tiledimage.js

@@ -1608,7 +1608,7 @@ function loadTile( tiledImage, tile, time ) {
  */
 function onTileLoad( tiledImage, tile, time, image, errorMsg, tileRequest ) {
     if ( !image ) {
-        $.console.log( "Tile %s failed to load: %s - error: %s", tile, tile.url, errorMsg );
+        $.console.error( "Tile %s failed to load: %s - error: %s", tile, tile.url, errorMsg );
         /**
          * Triggered when a tile fails to load.
          *
@@ -1634,7 +1634,7 @@ function onTileLoad( tiledImage, tile, time, image, errorMsg, tileRequest ) {
     }
 
     if ( time < tiledImage.lastResetTime ) {
-        $.console.log( "Ignoring tile %s loaded before reset: %s", tile, tile.url );
+        $.console.warn( "Ignoring tile %s loaded before reset: %s", tile, tile.url );
         tile.loading = false;
         return;
     }

src/viewer.js

@@ -1252,6 +1252,15 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
     },
 
 
+    //
+    /**
+     * @function
+     * @returns {Boolean} returns true if the viewer is in fullscreen
+     */
+     isFullScreen: function () {
+        return $.isFullScreen() && this.isFullPage();
+    },
+
     /**
      * @function
      * @param {Boolean} visible
@@ -2657,8 +2666,8 @@ function onCanvasKeyDown( event ) {
     var canvasKeyDownEventArgs = {
       originalEvent: event.originalEvent,
       preventDefaultAction: false,
-      preventVerticalPan: event.preventVerticalPan,
-      preventHorizontalPan: event.preventHorizontalPan
+      preventVerticalPan: event.preventVerticalPan || !this.panVertical,
+      preventHorizontalPan: event.preventHorizontalPan || !this.panHorizontal
     };
 
     /**
@@ -2728,8 +2737,8 @@ function onCanvasKeyPress( event ) {
     var canvasKeyPressEventArgs = {
       originalEvent: event.originalEvent,
       preventDefaultAction: false,
-      preventVerticalPan: event.preventVerticalPan,
-      preventHorizontalPan: event.preventHorizontalPan
+      preventVerticalPan: event.preventVerticalPan || !this.panVertical,
+      preventHorizontalPan: event.preventHorizontalPan || !this.panHorizontal
     };
 
     // This event is documented in onCanvasKeyDown
@@ -2779,8 +2788,8 @@ function onCanvasKeyPress( event ) {
                 break;
             case 97://a
                 if (!canvasKeyPressEventArgs.preventHorizontalPan) {
-                  this.viewport.panBy(this.viewport.deltaPointsFromPixels(new $.Point(-40, 0)));
-                  this.viewport.applyConstraints();
+                    this.viewport.panBy(this.viewport.deltaPointsFromPixels(new $.Point(-40, 0)));
+                    this.viewport.applyConstraints();
                 }
                 event.preventDefault = true;
                 break;

test/demo/basic.html

@@ -27,7 +27,6 @@
             tileSources: "../data/testpattern.dzi",
             showNavigator:true
         });
-
     </script>
 </body>
 </html>