- fix bug: root or container params with NodeList value are not

   treated as array, which should.
 - support `zmgr` directly in object.
 - use zmgr fallback instead of old zstack to simplify code logic
 - rename `ldloader` zmgr api ( from `set-zmgr` to `zmgr` )
 - rename `ldld.js`, `ldld.css` to `index.js`, `index.css`, including
   minimized version.
 - bump version

Author: zbryikt

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## v2.0.0
+
+ - fix bug: `root` or `container` params with `NodeList` value are not treated as array, which should.
+ - support `zmgr` directly in object.
+ - use zmgr fallback instead of old zstack to simplify code logic
+ - rename `ldloader` zmgr api ( from `set-zmgr` to `zmgr` )
+ - rename `ldld.js`, `ldld.css` to `index.js`, `index.css`, including minimized version.
+
+
 ## v1.2.1
 
  - deprecate `ldLoader`. use `ldloader` instead.

build

@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 rm -rf dist
 mkdir -p dist
-echo "build src/ldld.ls -> dist/ldld.js ..."
-./node_modules/.bin/lsc -cp --no-header src/ldld.ls > dist/ldld.js
-echo "build src/ldld.styl -> dist/ldld.css ..."
-./node_modules/.bin/stylus -p src/ldld.styl > dist/ldld.css
-echo "minifying ldld.js ..."
-./node_modules/.bin/uglifyjs dist/ldld.js > dist/ldld.min.js
-echo "minifying ldld.css ..."
-./node_modules/.bin/uglifycss dist/ldld.css > dist/ldld.min.css
+echo "build src/ldld.ls -> dist/index.js ..."
+./node_modules/.bin/lsc -cp --no-header src/ldld.ls > dist/index.js
+echo "build src/ldld.styl -> dist/index.css ..."
+./node_modules/.bin/stylus -p src/ldld.styl > dist/index.css
+echo "minifying index.js ..."
+./node_modules/.bin/uglifyjs dist/index.js > dist/index.min.js
+echo "minifying index.css ..."
+./node_modules/.bin/uglifycss dist/index.css > dist/index.min.css
 echo "done."
 echo "Copy dist/ to web/ ..."
 rm -rf web/static/assets/lib/ldloader/dev/

dist/ldld.css dist/index.cssdist/ldld.css renamed to dist/index.css

@@ -169,23 +169,11 @@
         zmgr = this$._zmgr || ldloader._zmgr;
         if (running) {
           this$.z = zmgr.add(this$.opt.baseZ);
-          /*
-          if zmgr => @z = zmgr.add @opt.base-z
-          else
-            @z = (ldloader.zstack[* - 1] or @opt.base-z) + 1
-            ldloader.zstack.push z
-          */
           this$.root.map(function(it){
             return it.style.zIndex = this$.z;
           });
         } else {
           zmgr.remove(this$.z);
-          /*
-          if zmgr => zmgr.remove @z
-          else
-            if (idx = ldloader.zstack.indexOf(@z)) < 0 => return res!
-            ldloader.zstack.splice(idx, 1)
-          */
           this$.root.map(function(it){
             return it.style.zIndex = "";
           });
@@ -194,11 +182,6 @@
       });
     }
   });
-  /*
-  ldloader <<< do
-    zstack: []
-    zmgr: -> if it? => @_zmgr = it else @_zmgr
-  */
   import$(ldloader, {
     _zmgr: {
       add: function(v){

…b/static/assets/lib/ldloader/dev/ldld.js dist/index.jsweb/static/assets/lib/ldloader/dev/ldld.js renamed to dist/index.js web/static/assets/lib/ldloader/dev/ldld.js renamed to dist/index.js

@@ -3,7 +3,7 @@
   "name": "ldloader",
   "license": "MIT",
   "description": "loader manipulation library",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "files": [
     "dist/**/*"
   ],
@@ -20,6 +20,7 @@
     "start": "npx server -r web -o true"
   },
   "devDependencies": {
+    "@loadingio/debounce.js": "^0.0.1",
     "@loadingio/ldquery": "^2.1.0",
     "@loadingio/loading.css": "^2.0.1",
     "bootstrap": "^4.5.3",
@@ -31,17 +32,20 @@
     "stylus": "^0.54.5",
     "template": "github:zbryikt/template#v2.3.13",
     "uglify-js": "=3.2.0",
-    "uglifycss": "0.0.29"
+    "uglifycss": "0.0.29",
+    "zmgr": "^1.0.0"
   },
   "frontendDependencies": {
     "root": "web/static/assets/lib",
     "modules": [
       "@loadingio/ldquery",
       "@loadingio/loading.css",
+      "@loadingio/debounce.js",
       "ldbutton",
       "ldcover",
       "bootstrap",
-      "bootstrap.ldui"
+      "bootstrap.ldui",
+      "zmgr"
     ]
   }
 }

dist/ldld.min.css dist/index.min.cssdist/ldld.min.css renamed to dist/index.min.css

@@ -1,15 +1,19 @@
 ldloader = (opt={}) ->
   @opt = {active-class: \running, base-z: 4000, auto-z: false, class-name: '', atomic: true} <<< opt
+  if opt.zmgr => @zmgr opt.zmgr
   <[root container]>.map (n) ~> if opt[n] =>
-    @[n] = (if Array.isArray(opt[n]) => opt[n] else [opt[n]]).map ->
+    list = if Array.isArray(opt[n]) => opt[n]
+    else if opt[n] instanceof NodeList => Array.from(opt[n])
+    else [opt[n]]
+    @[n] = list.map ->
       ret = if typeof(it) == \string => document.querySelector(it) else it
       if !ret => console.warn "[ldloader] warning: no node found for #it"
       ret
   if !@container => @container = if @root => @root.map(-> it.parentNode) else [document.body]
   if !@root => @root = @container.map ->
-      node = document.createElement("div")
-      it.appendChild node
-      return node
+    node = document.createElement("div")
+    it.appendChild node
+    return node
   @root.map ~>
     it.classList.add.apply it.classList, (@opt.class-name or '').split(' ').filter(->it)
     it.classList.remove opt.active-class
@@ -18,6 +22,7 @@ ldloader = (opt={}) ->
   @
 
 ldloader.prototype = Object.create(Object.prototype) <<< do
+  zmgr: -> if it? => @_zmgr = it else @_zmgr
   is-on: -> return @running
   on: (delay=0) -> @toggle true, delay
   off: (delay=0, force = false) -> @toggle false, delay, force
@@ -55,23 +60,21 @@ ldloader.prototype = Object.create(Object.prototype) <<< do
       @running = running = @root.0.classList.contains(@opt.active-class)
       if @opt.ctrl => @render!
       if !@opt.auto-z => return res!
+      zmgr = @_zmgr or ldloader._zmgr
       if running =>
-        if ldloader.zmgr => @z = ldloader.zmgr.add @opt.base-z
-        else
-          @z = (ldloader.zstack[* - 1] or @opt.base-z) + 1
-          ldloader.zstack.push z
+        @z = zmgr.add @opt.base-z
         @root.map ~> it.style.zIndex = @z
       else
-        if ldloader.zmgr => ldloader.zmgr.remove @z
-        else
-          if (idx = ldloader.zstack.indexOf(@z)) < 0 => return res!
-          ldloader.zstack.splice(idx, 1)
+        zmgr.remove @z
         @root.map ~> it.style.zIndex = ""
       res!
 
 ldloader <<< do
-  zstack: []
-  set-zmgr: -> @zmgr = it
+  _zmgr: do
+    add: (v) -> @[]s.push(z = Math.max(v or 0, (@s[* - 1] or 0) + 1)); return z
+    remove: (v) -> if (i = @[]s.indexOf(v)) < 0 => return else @s.splice(i,1)
+  zmgr: -> if it? => @_zmgr = it else @_zmgr
+
 
 if module? => module.exports = ldloader
 else window.ldloader = window.ldLoader = ldloader