Merge remote-tracking branch 'origin/scrolltop-fix' into 2.0.4-option…

…al-refocus

Conflicts:
	dist/pinny.min.js

dist/pinny.js

@@ -38,6 +38,7 @@
     /* jshint ignore:end */
 
     var $window = $(window);
+    var iOS8 = $.os.ios && $.os.major >= 8;
     var needsSpacer = ($.os.ios && $.os.major <= 7) ||
         ($.os.android && $.os.major <= 4);
 
@@ -127,6 +128,13 @@
 
                     this._trigger('opened');
 
+                    // Lockup scrolls the lockup container but the page will not be in the correct scroll position.
+                    // We will set it to the top so the page would appear exactly where you left off.
+
+                    if (iOS8) {
+                        $(window).scrollTop(0);
+                    }
+
                 }.bind(this), 0);
             },
             closeComplete: function() {
@@ -197,6 +205,12 @@
                 return;
             }
 
+            // Force window repaint before Pinny opens so that it will
+            // render correctly and not double the viewport width.
+            if (iOS8) {
+                this._repaint();
+            }
+
             this._trigger('open');
 
             bouncefix.add(classes.SCROLLABLE);