beyond-rails 0.0.211 → 0.0.216

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6407e05c31dcab18c92de68c77c556eecb6d50cf900a4981bd025e14c0dd2329
-  data.tar.gz: 8754a1b9acc9ba94fcea7dce15c47de426a5eff296baae03dca5d4c122280540
+  metadata.gz: 9fe01a2e2f9bee54d4f3f5e44b26bca8b223666c0749383fcde789ffae9fca6c
+  data.tar.gz: 56434ea193d4294f2c74d70ab41acfc85fa531b53ec8888d862d3729861a56de
 SHA512:
-  metadata.gz: 357f6a9f9537bf40ce92fbd7ff28f8b6a8575a842c0934c4b803115d44a5163c0441a792a2bb59ae107ff93a3cf6405038400b9cbe45cf6044a9a34bdcb44959
-  data.tar.gz: 01fa95db2b046ab26f27db76e04166d67501c3d29a7eca762cb07487bd98865da31e239c3454ce41940c8417f2869563de86d21625d03f267dad6b8aeb30caae
+  metadata.gz: d64f68417f19ff8e8640a052d917df93eb49dd05b87c6c727ea0ed42056ad45d34258ba2396f3aa7da5a5ea4c03879a4448f934fdf83fe24e885484495351dcf
+  data.tar.gz: 9226d6dadae03caf44bf49f13b0c3545ac3ecab2af677704c4be0a5d2bf18a847d65e77db81bbe51ab03d3ac6ed327f4ef790694c0418e58396053b6f7483463

data/src/js/components/Modal.js

@@ -1,5 +1,6 @@
 import supportDom from '../decorators/supportDom'
 import { noop } from '../utils'
+import domEval from '../utils/domEval'
 
 let globalModalId = 0
 
@@ -56,6 +57,9 @@ export default class Modal {
     this.modal.style.display = 'block'
     setTimeout(() => {
       this.modal.classList.add('js-active')
+      if (typeof $ === 'function') {
+        $(this.dom).trigger('beyond.modal.show')
+      }
     }, 50)
   }
 
@@ -64,6 +68,9 @@ export default class Modal {
     this.modal.classList.remove('js-active')
     setTimeout(() => {
       this.modal.style.display = 'none'
+      if (typeof $ === 'function') {
+        $(this.dom).trigger('beyond.modal.hide')
+      }
     }, 300)
   }
 
@@ -75,11 +82,21 @@ export default class Modal {
     const div = document.createElement('div')
     div.innerHTML = html.trim()
     const dom = div.firstChild
+
+    // keep the id that is created by $.uniqModal()
+    const originalDomId = this.dom.id
+    if (originalDomId === 'beyond-uniq-modal') {
+      dom.id = originalDomId
+    }
+
     this.dom.parentNode.replaceChild(dom, this.dom)
 
     this.dom = dom
     this.dom._modal = this
     this.init()
+
+    Array.from(dom.querySelectorAll('script'))
+      .forEach(script => domEval(script.text))
   }
 
   visible() {

data/src/js/decorators/supportDom.js

@@ -1,19 +1,20 @@
 import { isFunction } from '../utils'
-import isUndef from '../utils/isUndef'
 import createdComponents from '../consts/createdComponents'
 
 const domMap = new Map()
 
 export default function supportDom(target) {
 
+  const targetName = target.name
+
   return class extends target {
 
     init() {
-      if (domMap.has(this.dom) && isUndef(this._skipDomChecking)) {
-        console.warn('This dom has already been initialized.', this.dom)
+      if (this.classNameUsed) {
+        console.warn(`This dom has already been initialized by ${targetName}`, this.dom)
         return
       }
-      this.setDomToMap()
+      this.setClassNameByDom(target)
 
       this._listeners = []
       this._externalListeners = []
@@ -23,18 +24,38 @@ export default function supportDom(target) {
       createdComponents.push(this)
     }
 
-    setDomToMap() {
+    get classNameUsed() {
+      if (this._skipDomChecking) {
+        return false
+      }
+      const classnames = domMap.get(this.dom) || []
+      return classnames.includes(targetName)
+    }
+
+    setClassNameByDom(target) {
       const { dom } = this
       if (dom) {
-        domMap.set(dom, true)
+        const classes = domMap.get(dom) || []
+        classes.push(targetName)
+        domMap.set(dom, classes)
       }
     }
 
-    deleteDomFromMap() {
+    deleteClassNameByDom(target) {
       const { dom } = this
-      if (dom) {
+      if (! dom) {
+        return
+      }
+      const { name } = target
+      const classnames = (domMap.get(dom) || [])
+        .filter(classname => classname !== name)
+
+      if (classnames.length === 0) {
         domMap.delete(dom)
       }
+      else {
+        domMap.set(dom, classnames)
+      }
     }
 
     on(name, func) {
@@ -59,7 +80,7 @@ export default function supportDom(target) {
     }
 
     destroy() {
-      this.deleteDomFromMap()
+      this.deleteClassNameByDom(target)
       this._externalListeners.length = 0
       this.removeEvents()
       if (isFunction(super.destroy)) {

data/src/js/utils/domEval.js

@@ -0,0 +1,5 @@
+export default function domEval(code) {
+  const script = document.createElement('script')
+  script.text = code
+  document.head.appendChild(script).parentNode.removeChild(script)
+}

data/src/sass/components/_form.scss

@@ -368,7 +368,15 @@ input[type="file"] {
 .input-group-prepend {
   margin-right: -1px;
 }
+.input-group-append {
+  margin-left: -1px;
+}
 
+.input-group > .form-control:not(:last-child) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  z-index: 1;
+}
 .input-group > .form-control:not(:first-child) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.211
+  version: 0.0.216
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -173,6 +173,7 @@ files:
 - src/js/utils/dateGt.js
 - src/js/utils/dateLt.js
 - src/js/utils/docReady.js
+- src/js/utils/domEval.js
 - src/js/utils/getFloatedTargetPos.js
 - src/js/utils/getKey.js
 - src/js/utils/index.js