Merge pull request #5 from yama-dev/v0.4.0

yama-dev · web-flow · commit c4efb05a6b3f · 2019-10-11T22:04:56.000+09:00
V0.4.0
diff --git a/dist/js-scroll-module.js b/dist/js-scroll-module.js
diff --git a/examples/index.html b/examples/index.html
@@ -28,18 +28,20 @@
 <body>
 
 <div class="l-wrap">
-  <div class="p-top">
+  <div id="p-top" class="p-top">
     <p class="alert alert-secondary"> .p-top </p>
   </div>
-  <div class="p-mid">
+  <div id="p-mid" class="p-mid">
     <p class="alert alert-secondary"> .p-mid </p>
   </div>
-  <div class="p-btm">
+  <div id="p-btm" class="p-btm">
     <p class="alert alert-secondary"> .p-btm </p>
   </div>
 </div>
 
 <nav class="p-nav">
+  <p><a class="btn btn-secondary" href="#p-btm">#p-btm</a></p>
+  <p><a class="btn btn-secondary" href=".p-btm">.p-btm</a></p>
   <button type="button" class="btn btn-secondary" data-scroll=".p-top">.p-top</button>
   <button type="button" class="btn btn-secondary" data-scroll=".p-btm">.p-btm</button>
   <button type="button" class="btn btn-secondary" data-scroll=".p-mid" data-scroll-header=".p-nav">.p-mid +.p-nav</button>
@@ -54,15 +56,26 @@
 
 <script src="../dist/js-scroll-module.js"></script>
 <script>
-  var JSM = new SCROLL_MODULE('[data-scroll]', {
-    duration: 500,
-    easing: SCROLL_MODULE.easeOutQuart,
-    trueFunction: function(){
-      if(window.innerWidth <= 765){
-        return true;
-      }
+var JSM = new SCROLL_MODULE('[data-scroll]', {
+  duration: 500,
+  easing: SCROLL_MODULE.easeOutQuart,
+  trueFunction: function(){
+    if(window.innerWidth <= 765){
+      return true;
     }
-  });
+  }
+});
+</script>
+<script>
+var JSM = new SCROLL_MODULE('[href^="#"]', {
+  duration: 500,
+  easing: SCROLL_MODULE.easeOutQuart,
+  trueFunction: function(){
+    if(window.innerWidth <= 765){
+      return true;
+    }
+  }
+});
 </script>
 
 </body>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yama-dev/js-scroll-module",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "",
   "keywords": [
     "module",
diff --git a/src/js-scroll-module.js b/src/js-scroll-module.js
@@ -51,7 +51,7 @@ export class SCROLL_MODULE {
 
   _attachEvent(){
     DOM.addEvent(this.state.elem_array, 'click', (e)=>{
-      let _elem_target_data = e.currentTarget.getAttribute(this.state.elem_selector.replace(/(\[|\])/g,''));
+      let _elem_target_data = e.currentTarget.getAttribute(this.state.elem_selector.replace(/(\[|\]|\^|=|"|#)/g,''));
       let _elem_target_data_header = e.currentTarget.getAttribute('data-scroll-header');
       let _elem_target_data_offset = e.currentTarget.getAttribute('data-scroll-offset');
       let _elem_target_data_true_offset = e.currentTarget.getAttribute('data-scroll-true-offset');
@@ -145,8 +145,8 @@ export class SCROLL_MODULE {
     this._animeFunctionPrep(target, duration, header, offset, trueOffset);
   }
 
-  static easeOutQuart(elapsed, initialValue, amountOfChange, duration){
-    return -amountOfChange * ((elapsed = elapsed / duration - 1) * elapsed * elapsed * elapsed - 1) + initialValue;
+  static easeOutQuart(t, b, c, d){
+    return -c * ((t = t / d - 1) * t * t * t - 1) + b;
   }
 
   static easeOutCubic(t, b, c, d) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@yama-dev/js-scroll-module",`
`3`		`- "version": "0.3.1",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"module",`