erictheise · GPavlovic · Mar 29, 2017 · Mar 29, 2017 · Apr 10, 2017 · Apr 17, 2017
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Rrose is a plugin for the Leaflet JavaScript Mapping Library. It's useful when y
 
 ### How to use it
 
-In your project, drop `leaflet.rrose-src.js` alongside `leaflet-src.js`, `leaflet.rrose.css` alongside `leaflet.css`. You can also install Rrose via [bower](http://bower.io/). Then, instead of instantiating a new `L.Popup` object, instantiate a new `L.Rrose` object:
+In your project, drop `leaflet.rrose-src.js` alongside `leaflet-src.js`, `leaflet.rrose.css` alongside `leaflet.css`. You can also install Rrose (v0.2.0) via [bower](http://bower.io/), or serve the library up from [jsDelivr](https://www.jsdelivr.com/?query=rrose). Then, instead of instantiating a new `L.Popup` object, instantiate a new `L.Rrose` object:
 
 
 ```javascript

diff --git a/bower.json b/bower.json
diff --git a/dist/leaflet.rrose-src.js b/dist/leaflet.rrose-src.js
@@ -17,40 +17,56 @@
 
 L.Rrose = L.Popup.extend({
 
-  _initLayout:function () {
+  _initLayout: function () {
     var prefix = 'leaflet-rrose',
       container = this._container = L.DomUtil.create('div', prefix + ' ' + this.options.className + ' leaflet-zoom-animated'),
       closeButton, wrapper;
 
-    if (this.options.closeButton) {
-      closeButton = this._closeButton = L.DomUtil.create('a', prefix + '-close-button', container);
-      closeButton.href = '#close';
-      closeButton.innerHTML = '&#215;';
-
-      L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
-    }
-
     // Set the pixel distances from the map edges at which popups are too close and need to be re-oriented.
-    var x_bound = 80, y_bound = 80;
+    var xBound, yBound;
+    if (this.options.xBound) {
+      xBound = this.options.xBound;
+    }
+    else {
+      xBound = 80;
+    }
+    if (this.options.yBound) {
+      yBound = this.options.yBound;
+    }
+    else {
+      yBound = 80;
+    }
     // Determine the alternate direction to pop up; north mimics Leaflet's default behavior, so we initialize to that.
     this.options.position = 'n';
     // Then see if the point is too far north...
-    var y_diff = y_bound - this._map.latLngToContainer
8000
Point(this._latlng).y;
+    var y_diff = yBound - this._map.latLngToContainerPoint(this._latlng).y;
     if (y_diff > 0) {
       this.options.position = 's'
     }
     // or too far east...
-    var x_diff = this._map.latLngToContainerPoint(this._latlng).x - (this._map.getSize().x - x_bound);
+    var x_diff = this._map.latLngToContainerPoint(this._latlng).x - (this._map.getSize().x - xBound);
     if (x_diff > 0) {
       this.options.position += 'w'
     } else {
     // or too far west.
-      x_diff = x_bound - this._map.latLngToContainerPoint(this._latlng).x;
+      x_diff = xBound - this._map.latLngToContainerPoint(this._latlng).x;
       if (x_diff > 0) {
         this.options.position += 'e'
       }
     }
 
+    if (this.options.closeButton) {
+      let closeButtonClass = prefix + '-close-button';
+      if (this.options.position === 's') {
+        closeButtonClass += ' ' + prefix + '-close-button-s';
+      }
+      closeButton = this._closeButton = L.DomUtil.create('a', closeButtonClass, container);
+      closeButton.href = '#close';
+      closeButton.innerHTML = '&#215;';
+
+      L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
+    }
+
     // Create the necessary DOM elements in the correct order. Pure 'n' and 's' conditions need only one class for styling, others need two.
     if (/s/.test(this.options.position)) {
       if (this.options.position === 's') {
@@ -83,7 +99,7 @@ L.Rrose = L.Popup.extend({
 
   },
 
-  _updatePosition:function () {
+  _updatePosition: function () {
     var pos = this._map.latLngToLayerPoint(this._latlng),
       is3d = L.Browser.any3d,
       offset = this.options.offset;
@@ -93,7 +109,12 @@ L.Rrose = L.Popup.extend({
     }
 
     if (/s/.test(this.options.position)) {
-      this._containerBottom = -this._container.offsetHeight + offset.y - (is3d ? 0 : pos.y);
+        if (this._map.getBounds()._southWest.lat < 0) {
+            this._containerBottom = -this._container.offsetHeight - offset.y + (is3d ? 0 : pos.y);
+        }
+        else {
+            this._containerBottom = -this._container.offsetHeight + offset.y - (is3d ? 0 : pos.y);
+        }
     } else {
       this._containerBottom = -offset.y - (is3d ? 0 : pos.y);
     }
@@ -113,3 +134,7 @@ L.Rrose = L.Popup.extend({
   }
 
 });
+
+L.rrose = function (options, source) {
+	return new L.Rrose(options, source);
+};
diff --git a/dist/leaflet.rrose.css b/dist/leaflet.rrose.css
@@ -80,6 +80,10 @@ a.leaflet-rrose-close-button {
     font-weight: bold;
 }
 
+a.leaflet-rrose-close-button-s {
+    top: 20px;
+}
+
 a.leaflet-rrose-close-button:hover {
     color: #999;
 }
@@ -136,4 +140,4 @@ a.leaflet-rrose-close-button:hover {
 
 .leaflet-rrose-content {
     font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif;
-}
+}
diff --git a/leaflet.rrose-src.js b/leaflet.rrose-src.js