自然ソートに対応

kyukyunyorituryo · Jun 11, 2019 · e34d3b5 · e34d3b5
1 parent 64d83dc
commit e34d3b5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 31 deletions.
diff --git a/index.html b/index.html
@@ -40,14 +40,15 @@
   integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="
   crossorigin="anonymous"></script>
     <!-- BootstrapのJS読み込み -->
-<script defer src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script defer src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
     <!-- 追加した部分 -->
        <script defer type="text/javascript" src="js/jszip.min.js"></script>
        <script defer type="text/javascript" src="js/FileSaver.js"></script>
        <script defer type="text/javascript" src="js/uuid.js"></script>
        <script defer type="text/javascript" src="js/FixedEpub3.js"></script>
        <script defer type="text/javascript" src="js/vkbeautify.js"></script>
        <script defer type="text/javascript" src="js/share.js"></script>
+       <script defer type="text/javascript" src="https://cdn.jsdelivr.net/npm/natsort@latest/index.min.js"></script>
   </head>
   <body >
       <!-- ナビゲーション -->
@@ -248,7 +249,7 @@ <h4 class="modal-title" id="myModalLabel">プレビュー</h4>
      data-ad-client="ca-pub-2060968321037871"
      data-ad-slot="9449012873"
      data-ad-format="auto"></ins>
-<script>
+<script >
 (adsbygoogle = window.adsbygoogle || []).push({});
 </script>
   </body>

diff --git a/index_beta.html b/index_beta.html
@@ -16,6 +16,7 @@
 <script type="text/javascript" src="js/uuid.js"></script>
 <script type="text/javascript" src="js/ejs.min.js"></script>
 <script type="text/javascript" src="js/fxlepub_beta.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/natsort@latest/index.min.js"></script>
 </head>
 <body>
 <div class=" col-sm-2"></div>

diff --git a/js/FixedEpub3.js b/js/FixedEpub3.js
@@ -144,24 +144,18 @@ function mySort() {
 var list = document.getElementById('list');
 var Nlist=list.getElementsByTagName('span');
 var myArray = Array.prototype.slice.call(Nlist);
-   function compareText (a,b) {
-        if (a.firstChild.title > b.firstChild.title)
-            return 1;
-        else if (a.firstChild.title < b.firstChild.title)
-            return -1;
-        return 0;
-        }
-    myArray.sort(compareText);
+var sorter = natsort();
+    myArray.sort(function(a, b) {
+  return sorter(a.firstChild.title, b.firstChild.title);
+});
        for (var i=0; i<myArray.length; i++) {
         list.appendChild(list.removeChild(myArray[i]))
     }
 
 //画像ファイル名で整列
 //imgFO = [{file_id:"",file_name:'cover.jpg',data:'',type:'image/jpeg'}];
- imgFO.sort(function(a,b){
-    if(a.file_name<b.file_name) return -1;
-    if(a.file_name > b.file_name) return 1;
-    return 0;
+ imgFO.sort(function(a, b) {
+  return sorter(a.file_name, b.file_name);
 });
 addselect();
 }

diff --git a/js/fxlepub_beta.js b/js/fxlepub_beta.js
@@ -287,26 +287,18 @@ function mySort() {
     var list = document.getElementById('list');
     var Nlist = list.getElementsByTagName('span');
     var myArray = Array.prototype.slice.call(Nlist);
-    function compareText(a, b) {
-        if (a.firstChild.title > b.firstChild.title)
-            return 1;
-        else if (a.firstChild.title < b.firstChild.title)
-            return -1;
-        return 0;
-    }
-    myArray.sort(compareText);
-    for (var i = 0; i < myArray.length; i++) {
+var sorter = natsort();
+myArray.sort(function(a, b) {
+  return sorter(a.firstChild.title, b.firstChild.title);
+});
+for (var i = 0; i < myArray.length; i++) {
         list.appendChild(list.removeChild(myArray[i]))
     }
 
-    //画像ファイル名で整列
-    //imgFO = [{file_id:"",file_name:'cover.jpg',data:'',type:'image/jpeg'}];
-    data.files.sort(function (a, b) {
-        if (a.file_name < b.file_name) return -1;
-        if (a.file_name > b.file_name) return 1;
-        return 0;
-    });
-    addselect();
+ data.files.sort(function(a, b) {
+  return sorter(a.file_name, b.file_name);
+});
+addselect();
 }
 
 //selectの追加