Merge pull request #99 from pattern-lab/hotfix/ish-config-tweak

If both ish config settings are used, use the larger value

Author: bmuenzenmeyer

dist/styleguide/js/patternlab-viewer.js

@@ -1342,6 +1342,13 @@ window.addEventListener("message", receiveIframeMessage, false);
       maxViewportWidth = config.ishViewportRange.l[1];
     }
 
+    //if both are set, then let's use the larger one.
+    if (config.ishViewportRange && config.ishMaximum) {
+      var largeRange = parseInt(config.ishViewportRange.l[1]);
+      var ishMaximum = parseInt(config.ishMaximum);
+      maxViewportWidth = largeRange > ishMaximum ? largeRange : ishMaximum;
+    }
+
     var viewportResizeHandleWidth = 14, //Width of the viewport drag-to-resize handle
     $sgViewport = $('#sg-viewport'), //Viewport element
     $sizePx = $('.sg-size-px'), //Px size input element in toolbar