Changeset 41 for branches/testa-single-bookmark/js/sidemenu.js

Timestamp:

Aug 30, 2019 7:54:52 AM (6 years ago)

Author:

anonymous

Message:

add bin

File:

• branches/testa-single-bookmark/js/sidemenu.js (modified) (7 diffs)

branches/testa-single-bookmark/js/sidemenu.js

@@ -12 +12 @@
     }
 
-    async setup(top_sel){
-        console.log("SideMenu setup menu_sel=" + this.menu_sel)
-        let content = `<ul id="${this.menu_id}"></ul>`
-        $(top_sel).append( content )
-        this.get_filelist_async( this.num , this.part , (text) => {
-            console.log("SideMenu setup text=" + text)
-            let str = text
-            let obj
-            if( str.match( /{.*}/ ) === null ){
-                obj = {}
-                console.log("sidemenu setup 1 num=" + this.num + " part=" + this.part)
-            }
-            else {
-                obj = JSON.parse( str )
-                console.log("sidemenu setup 2 num=" + this.num + " part=" + this.part + " str="+str)
-            }
-            console.log( "sidemenu setup this.num=" + this.num + " this.part=" + this.part )
-            Globalx.storagex.change_cache( obj, this.num , this.part )
-            
-            this.make_menu_item_list( obj , Globalx[this.part].key)
-            $( this.menu_sel ).menu({
+    display_menu( text ) {
+        let str = text
+        let obj
+        if( str.match( /{.*}/ ) === null ){
+            console.log("sidemenu 1 num="+ this.num + " part="+ this.part +" str="+str)
+            obj = {}
+        }
+        else {
+            console.log("sidemenu 2 num="+ this.num +" part="+ this.part +" str="+str)
+            obj = JSON.parse( str )
+        }
+        Globalx.storagex.change_cache( obj, this.num , this.part )
+
+        this.setup_menu(obj)
+    }
+
+    setup_menu(obj){
+        this.make_menu_item_list( obj , Globalx[this.part].key)
+        if( Globalx[this.part].menu === null ){
+            Globalx[this.part].menu = $( this.menu_sel ).menu({
                 classes: {
                     "ui-menu": "highlight"
                 }
             })
-        })
+        }
+    }
+
+    menu_init( top_sel ){
+        $( top_sel ).empty()
+        let content = `<ul id="${this.menu_id}"></ul>`
+        $( top_sel ).append( content )
+    }
+
+    async setup( top_sel ){
+        this.menu_init( top_sel )
+        this.get_filelist_async( this.num , this.part , (text) => {
+            this.display_menu(text)
+        } )
+    }
+
+    async update( top_sel ){
+        this.menu_init( top_sel )
+        await Globalx.remotex.update_filelist( this.num, this.part, (text) => {
+            this.display_menu(text)
+        } )
     }
 
     async get_filelist_async( num , part , func){
-        if( part == "setting" ){
-            console.log( "get_filelist_async START part="+ part)
-        }
         let realData = Globalx.storagex.get_filelist( num , part )
 
-        if( part == "setting" ){
-            console.log( "get_filelist_async 2 part=" + part)
-        }
         if( realData === undefined || realData === null ){
-            if( part == "setting" ){
-                console.log( "get_filelist_async 3 part=" + part)
-            }
             await Globalx.remotex.get_filelist_from_remote( num, part, func )
-            if( part == "setting" ){
-                console.log( "get_filelist_async 4 part=" + part)
-            }
         }
         else{
             const obj = Globalx.storagex.get_filelist( num , part )
-            this.make_menu_item_list( obj , Globalx[this.part].key)
-            $( this.menu_sel ).menu({
-                classes: {
-                    "ui-menu": "highlight"
-                }
-            })
+            this.setup_menu( obj )
         }
     }
@@ -121 +123 @@
             if( jsondata[Globalx[part].key].length == 0 ){
                 Globalx[part].key_indicate_file = true;
+console.log("Globalx[" + part + "].key_indicate_file = " + Globalx[part].key_indicate_file)
                 let url = ""
                 $( Globalx[part].download_url_sel ).val( Globalx[part].key )
@@ -128 +131 @@
                 $( Globalx[part].download_partial_url_sel ).attr('href' , url )
                 Globalx.remotex.get_content( this.num, this.part, Globalx[part].key , (content) => {
-                    //console.log("content=" + content)
                     Globalx[part].editor.getSession().setValue( content );
                     $( Globalx[part].textarea_sel ).val( content );
@@ -143 +145 @@
         let name = '..(Up)'
         content = `<li class="ui-menu-item"><div class="ui-menu-item-wrapper hasmenu">${name}</div></li>`;
-        // content = `<li class="ui-menu-item"><div class="ui-menu-item-wrapper hasmenu" onclick="menu_action( '${this.part}', '${this.name}', true)">${name}</div></li>`;
-        //      content = `<li class="ui-menu-item"><div class="ui-menu-item-wrapper hasmenu" onclick="this.menu_action_2">${name}</div></li>`;
         $( this.menu_sel ).append(content);
-        item = $( this.menu_sel ).last()
+        item = $( this.menu_sel ).children().last()
         item.on('click' , () => {
             this.menu_action( key , true )
@@ -154 +154 @@
             ary.map( ( item_name ) => {
                 content = `<li class="ui-menu-item"><div class="ui-menu-item-wrapper hasmenu">${item_name}</div></li>`;
-                // content = `<li class="ui-menu-item"><div class="ui-menu-item-wrapper hasmenu" onclick="menu_action( '${this.part}', '${item_name}' , false)">${item_name}</div></li>`;
-                //          content = `<li class="ui-menu-item"><div class="ui-menu-item-wrapper hasmenu" onclick="this.menu_action_2">${item_name}</div></li>`;
                 $( this.menu_sel ).append(content);
-                item = $( this.menu_sel ).last()
+                item = $( this.menu_sel ).children().last()
                 item.on('click' , () => {
                     this.menu_action( item_name )
@@ -165 +163 @@
     }
 
-    set_globalx_item_name( item_name ) {
-        Globalx[this.part].item_name = item_name
-        let dl = $( Globalx[ this.part ].download_sel )
-        dl.attr('download' , Globalx[this.part].item_name)
+    set_globalx_item_name( part , item_name ) {
+        Globalx[part].item_name = item_name
+        let dl = $( Globalx[ part ].download_sel )
+        dl.attr('download' , Globalx[part].item_name)
         dl.removeAttr('href')
     }
@@ -190 +188 @@
 }
 
-/*
-function menu_action(part, item_name , up_flag = false) {
-    Globalx[part].sidemenu.menu_action(item_name , up_flag)
-}
-*/