beyond-rails 0.0.210 → 0.0.215

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec514dd926ca28093516f6a80efb90be67b6f0f4ff68d4f887499e2edcecf994
-  data.tar.gz: 760f05e94459b3d3ab0144beea55152c9cea9da5322683893f2199b28bdff3dc
+  metadata.gz: 2f68ab9a79de99e40d9e8460452b9cf7fdaa43ff92b2a553f5c1715f0f99fd6d
+  data.tar.gz: 2ba5dd5bb3e6ffa51fdb779d32c08e25a03a442cefa7e5803c3a1a66dd8f7f9d
 SHA512:
-  metadata.gz: be536b16af09e0b1e4651d1b52ca571e0fa653d8b34b9b3d2408a47a26f94a594ac2328142729fd5cb0e707e24d092bd58072048435f7f23e5078c72b5163756
-  data.tar.gz: fc650a64605dd22e174d6b8ce396aa6e6087c43016126a39c9da62bc1b67f634db22558dfeec5038e6e13088c250dfa6b1aa0da7686562aa754b157b2c9d35bc
+  metadata.gz: 83b82acf5fb118c6e6c26177cb0886bb90772f556b0da4ae371a18e77f3541f2427358eedfef4af09bd09bd03fa01fad89c117bd34cbce3b4893898aac5e1f17
+  data.tar.gz: 205e57cafe9e23882c7cf5614142d573cc5685550d718ba02b2fae32fa917111642ff75dbc2025f2b50664abfa84a74aa189657717b5580985b4c4c91754f880

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

@@ -104,7 +104,7 @@ label.required {
 .hint.hint-danger {
   color: #e03953;
   &:before {
-    font-family: 'icomoon';
+    font-family: $beyond-icon-font-name;
     margin-right: 4px;
     display: inline-block;
     transform: translateY(1px);
@@ -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.210
+  version: 0.0.215
 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