Changelog for #2201

Fix "Viewer.buttons is deprecated" warning issue

changelog.txt

@@ -3,6 +3,8 @@ OPENSEADRAGON CHANGELOG
 
 3.2.0: (in progress)
 
+* NEW BEHAVIOR: Setting the viewport rotation now animates by default (pass false for the new immediately parameter to disable) (#2136 @jonasengelmann)
+* DEPRECATION: Don't access the viewport's degrees property directly anymore; instead use setRotation and getRotation (#2136 @jonasengelmann)
 * Improved the constraints that keep the image in the viewer, specifically when zoomed out a lot (#2160 @joedf)
 * You can now provide an element for the navigator (as an alternative to an ID) (#1303 @cameronbaney, #2166 #2175 @joedf)
 * Now supporting IIIF "id" and "identifier" in addition to "@id" (#2173 @ahankinson)
@@ -10,6 +12,7 @@ OPENSEADRAGON CHANGELOG
 * Fixed: Cropping tiled images with polygons was broken (#2183 @altert)
 * Fixed: Disabling buttons only changed their appearance, but they were still clickable (#2187 @pearcetm)
 * Fixed: ImageTileSource produced an error having to do with getTileHashKey (#2190 @Aiosa)
+* Fixed: On startup you would get an unnecessary "Viewer.buttons is deprecated" warning (#2201 @joedf)
 
 3.1.0:
 

src/openseadragon.js

@@ -1101,8 +1101,13 @@ function OpenSeadragon( options ){
             if ( options !== null || options !== undefined ) {
                 // Extend the base object
                 for ( name in options ) {
-                    src = target[ name ];
-                    copy = options[ name ];
+                    var descriptor = Object.getOwnPropertyDescriptor(options, name);
+                    if (descriptor.get || descriptor.set) {
+                        Object.defineProperty(target, name, descriptor);
+                        continue;
+                    }
+
+                    copy = descriptor.value;
 
                     // Prevent never-ending loop
                     if ( target === copy ) {
@@ -1111,6 +1116,8 @@ function OpenSeadragon( options ){
 
                     // Recurse if we're merging plain objects or arrays
                     if ( deep && copy && ( OpenSeadragon.isPlainObject( copy ) || ( copyIsArray = OpenSeadragon.isArray( copy ) ) ) ) {
+                        src = target[ name ];
+
                         if ( copyIsArray ) {
                             copyIsArray = false;
                             clone = src && OpenSeadragon.isArray( src ) ? src : [];