beyond-rails 0.0.276 → 0.0.281

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0587787bc9b1b01ca9b6adfee2492dbd79f4a83b275df96ea58c90bde40e7d55'
-  data.tar.gz: 8ef857ab342e1d0935de5fef72c256ff684c57ecc53f3b26f219b8401b06972d
+  metadata.gz: 4fdbef0c60df577d5177297214104a62d44879abf628e92ba2ac9b263e344d22
+  data.tar.gz: 91e93ce0cc411b0721d5172b1813d347ce40268ae0815c404a34cf9c50960026
 SHA512:
-  metadata.gz: fa68191ab050166c130c418089b0127286b3998b61688ced221c0627ed055aa4a7f391273f74de49debeb13a3942ed209e47e5f17ad77e0bfa50e00d76a68a74
-  data.tar.gz: 07bbf67a42392542a4fb26532f4970ff47fce89b0c5c7458099fcc10fa6023bcc856064e9d21829ca246b64f1aa5f9d482bb045e21d6cd498fba8c195d41e44a
+  metadata.gz: aadf392da4fb29588d3871759b48aecaacd6e5250c9e6fcff7ec08f6d19232cb5260461565741a53c55a2397f8c6ae07a0ed7384325c9ddf2dc4066c3e19faea
+  data.tar.gz: e93b2ed5099895a980dcb14466a70a7e985b10cf020b83658130420050845c6c8e99043fc185f030ea060b34fcee4e61ca734b0479e67f47b0da1778d3e329f1

data/src/js/components/Btn.js

@@ -11,8 +11,11 @@ export default class Btn {
   }
 
   showLoader() {
+    if (this.loading) {
+      return
+    }
     const { dom } = this
-    this._innerHtml = dom.innerHTML
+    this.innerHtml = dom.innerHTML
     dom.style.height = toPixel(dom.offsetHeight)
     dom.style.width = toPixel(dom.offsetWidth)
     dom.innerHTML = `
@@ -28,14 +31,23 @@ export default class Btn {
   }
 
   hideLoader() {
+
+    if (! this.loading) {
+      return
+    }
     const { dom } = this
     dom.style.removeProperty('width')
     dom.style.removeProperty('height')
-    dom.innerHTML = this._innerHtml
+
+    const { innerHtml } = this
+
+    if (innerHtml) {
+      dom.innerHTML = innerHtml
+    }
   }
 
   setLoading(loading) {
-    this.loading = loading
     loading ? this.showLoader() : this.hideLoader()
+    this.loading = loading
   }
 }

data/src/js/components/SearchDropdown.js

@@ -26,6 +26,7 @@ export default class SearchDropdown {
     this.offsetTop = options.offsetTop || 0
     this.offsetLeft = options.offsetLeft || 0
     this.noDataMsg = options.noDataMsg || '沒有資料'
+    this.getFloatedTargetPos = options.getFloatedTargetPos || getFloatedTargetPos
     this.isMenuVisible = false
     this.lastKeyword = null
     this.selectedIndex = 0
@@ -164,7 +165,7 @@ export default class SearchDropdown {
 
   adjustMenuPos() {
     const { menu, dom, offset, offsetLeft, offsetTop } = this
-    const { pos, place, align } = getFloatedTargetPos({
+    const { pos, place, align } = this.getFloatedTargetPos({
       src: dom,
       target: menu,
       place: this.place,

data/src/sass/components/_alert.scss

@@ -40,6 +40,10 @@
     }
   }
 }
+
+.alert.alert-dismissible {
+  padding-right: 3rem;
+}
 .alert-dismissible .close {
   position: absolute;
   top: 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.276
+  version: 0.0.281
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc