Changeset 36 for branches/testa-single-bookmark/js/storagex.js

Timestamp:

Aug 26, 2019 6:15:44 PM (6 years ago)

Author:

anonymous

Message:

hide unused menu by css

File:

• branches/testa-single-bookmark/js/storagex.js (modified) (10 diffs)

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

@@ -2 +2 @@
     constructor () {
         this._globalStorage = {}
-        this._items = ["num", "index", "parts"]
+        this._items = GlobalxItems
     }
 
@@ -36 +36 @@
         this.copy_obj_with_part(info, Globalx, part)
         
-        info[part].bookmark_mgr = this.convert_to_plain_object_from_bookmark_mgr(Globalx[part].bookmark_mgr)
+        info.bookmark_mgr = this.convert_to_plain_object_from_bookmark_mgr(Globalx.bookmark_mgr)
     }
 
@@ -42 +42 @@
         this._globalStorage[key] = obj
         localStorage.setItem(key , JSON.stringify(obj) )
+    }
+
+    change_cache_x( obj ){
+        this._globalStorage[key] = obj
+//      localStorage.setItem(key , JSON.stringify(this._globalStorage[key]) )
     }
 
@@ -50 +55 @@
     }
 
-    convert_to_array_from_bookmark_mgr(mgr){
-        return {
-            paths: mgr.get_paths(),
-            items: mgr_to_array(mgr),
-            max_display_name_length: mgr.max_display_name_length()
-        }
+    async convert_mgr_object_async( mgr, array ){
+        return await array.map( (path) => {
+            const item = mgr.get(part , path)
+            return { 
+                part: part,
+                path: item.path,
+                display_name: item.display_name
+            }
+        })
     }
 
     convert_to_plain_object_from_bookmark_mgr(mgr){
-        const paths = mgr.get_paths()
-        const new_bk_items = paths.map( ( path ) => {
-            let ret = {
-                path: "",
-                display_name: ""
-            }
-            item = mgr.get(path)
-            if( item != null ){
-                ret.path = path
-                ret.display_name = item.display_name
-            }
-            return ret
-        } )
-        
-        return {
-            max_display_name_length: mgr.max_display_name_length,
-            items: new_bk_items
-        }
+        let obj = {}
+        obj.bms = {}
+
+        Object.entries( mgr.paths ).map( ([part, array]) => {
+            obj.bms[part] = this.convert_mgr_object_async(mgr, array)
+        } )
+
+        obj.max_display_name_length = mgr.max_display_name_length
+        obj.parts = mgr.parts
+
+        return obj
+    }
+
+    convert_to_plain_object_from_bookmark_mgr0(mgr){
+        let obj = {}
+        obj.bms = Object.fromEntries( Object.entries( mgr.paths ).map( ([part, array]) => {
+            const bk_items = this.convert_mgr_object_async(mgr, array)
+
+            ([part, bk_items])
+        } ) )
+        obj.max_display_name_length = mgr.max_display_name_length
+        obj.parts = mgr.parts
+
+        return obj
     }
 
     copy_obj_with_part(to_obj, from_obj, part){
-        const items = ["editor_id", "textarea_sel" , "menu_id", "bookmark_id", "bookmark_op_id", "item_name", "bookmarks", "key_sel", "download_sel", "menu_sel", "bookmark_sel", "bookmark_op_sel", "bookmark_mgr" ]
-        const init_value_items = ["editor", "key_indicate_file", "key"]
-        
+        const items = [
+            "editor_id", 
+            "textarea_sel" , 
+            "menu_id", 
+            "bookmark_id", 
+            "bookmark_op_id", 
+            "item_name", 
+            "bookmarks", 
+            "key",
+            "key_sel", 
+            "download_sel", 
+            "download_url_sel", 
+            "download_partial_url_sel", 
+            "menu_sel" ,
+            "bookmark_mgr" ,
+            "bookmark_op_sel" 
+        ]
         if( to_obj[part] === undefined ){
             to_obj[part] = {}
         }
         this.copy_object( to_obj[part], from_obj[part], items )
-        this.copy_object( to_obj[part], GlobalxInitValue, init_value_items )
+        this.copy_object( to_obj[part], GlobalxInitValue, GlobalxInitValueItems )
     }
 
@@ -115 +143 @@
         if( str ){
             ret = this._globalStorage[key] = JSON.parse(str)
-//          console.log("rfl 1 key=" + key + " str=" + str)
+//          console.log("### rfl 1 key=" + key + " str=" + str)
         }
         else{
@@ -122 +150 @@
             }
             ret = this._globalStorage[key]
-            console.log("rfl 2 key=" + key + " undefined")
+//          console.log("### rfl 2 key=" + key + " undefined")
         }
 
@@ -132 +160 @@
         const info = this.restore_info()
         if( info !== undefined && info !== null ){
-            this.restore_info_to_globalx_with_items(info, this._items)
+            need_to_save = this.restore_info_to_globalx_with_items(info, this._items)
         }
         else{
@@ -142 +170 @@
 
     convert_to_bookmark_mgr_from_plain_object(mgr) {
-        let new_mgr = new BookmarkMgr( mgr.max_display_name_length )
-        
-        const bk_items = mgr.items
-        bk_items.map( (bk_item) => {
-            return new_mgr.add( bk_item.path , bk_item.display_name)
-        })
+        let new_mgr = new BookmarkMgr( mgr.max_display_name_length , mgr.parts)
+        
+        const bk_items = mgr.bms
+        Object.entries( ([part, bk_items]) => {
+            new_bk_items = bk_items.map( (bk_item) => {
+                return new_mgr.add( bk_item.part , bk_item.path , bk_item.display_name)
+            } )
+            [part, new_bk_items]
+        } )
+        
         return new_mgr
     }
 
     restore_info_to_globalx_with_items(info, items){
+        let need_to_save = true
+
         this.copy_object( Globalx, info, items )
-        
-        info.parts.map( (part) => {
-            this.restore_globalx_from_info_part(info , part)
-        } )
+
+        if( info.bookmark_mgr !== undefined ){
+            info.bookmark_mgr = this.convert_to_bookmark_mgr_from_plain_object(info.bookmark_mgr)
+        
+            if( info.parts !== undefined ){
+                info.parts.map( (part) => {
+                    this.restore_globalx_from_info_part(info , part)
+                } )
+                need_to_save = false
+            }
+        }
+        else{
+            Globalx.bookmark_mgr = null
+        }
+        return need_to_save
     }
 
     restore_globalx_from_info_part(info , part){
-        info[part].bookmark_mgr = this.convert_to_bookmark_mgr_from_plain_object(info[part].bookmark_mgr)
         this.copy_obj_with_part(Globalx, info, part)
     }
@@ -168 +212 @@
     }
 
-
+    get_output_url() {
+        return this._globalStorage.output_url
+    }
 
     reset_info = () => {
@@ -186 +232 @@
         localStorage.clear()
     }
+
     show_localstorage() {
         window.open('local_storage.html', '_blank')