Changeset 36 for branches/testa-single-bookmark/js/main.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/main.js (modified) (8 diffs)

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

@@ -1 +1 @@
 let Globalx = {};
-let GlobalxInitValue = {
+const GlobalxItems = ["output_url"]
+const GlobalxInitValue = {
     editor: null,
     key_indicate_file: false,
     key: '/'
 };
+const GlobalxInitValueItems = ["editor", "key_indicate_file", "key"]
 
 function init_globalx_storagex() {
@@ -11 +13 @@
 
 function init_globalx() {
-    Globalx.num = 0;
-    Globalx.index = 0;
+    Globalx.num = 0
+    Globalx.index = 0
     Globalx.parts = ["data", "output", "setting"]
     Globalx.bookmark_displayname_max_length = 18
+    Globalx.output_url = null
 
     tab_init()
     topmenu_init()
     Globalx.remotex = new Remotex('php/content.php')
+    console.log( "init_globalx 1 : Globalx.bookmark_mgr="  + Globalx.bookmark_mgr )
+    if( Globalx.bookmark_mgr === null || Globalx.bookmark_mgr === undefined ){
+        Globalx.bookmark_mgr = new BookmarkMgr(Globalx.bookmark_displayname_max_length, Globalx.parts)
+    }
+    console.log( "init_globalx 2 : Globalx.bookmark_mgr="  + Globalx.bookmark_mgr )
+    Globalx.bookmarkmenu = null
 }
 
-function menu_action(part, item_name , up_flag = false) {
-    //console.log("menu_action 1")
-    Globalx[part].sidemenu.menu_action(item_name , up_flag)
-    //console.log("menu_action 2")
+async function get_output_url_async( func ){
+    let realData = Globalx.storagex.get_output_url()
+
+    if( realData === undefined || realData === null ){
+        await Globalx.remotex.get_output_url( func )
+    }
+    else{
+        const obj = Globalx.storagex.get_output_url( num , part )
+        Globalx.output_url = obj.output_url
+        Globalx.storagex.save_as_info_from_globalx()
+    }
+} 
+
+async function setup(){
+    get_output_url_async( (text) => {
+        let str = text
+        let obj
+        if( str.match( /{.*}/ ) === null ){
+            obj = {}
+        }
+        else {
+            obj = JSON.parse( str )
+        }
+        Globalx.storagex.change_cache( obj, this.num , this.part )
+    } )
 }
+
 
 function main() {
@@ -32 +63 @@
     let need_to_save = Globalx.storagex.restore_globalx_from_info()
     init_globalx()
+    setup()
+
+    console.log("##### Globalx.bookmarkmenu=" + Globalx.bookmarkmenu)
+    console.log("##### Globalx.bookmark_mgr=" + Globalx.bookmark_mgr)
+    Globalx.bookmarkmenu = new BookmarkMenu( Globalx.bookmark_displayname_max_length , Globalx.bookmark_mgr )
+    Globalx.bookmarkmenu.dlg()
 
     Globalx.parts.map( ( part ) => {
         set_globalx_editor(part)
-        Globalx[ part ].bookmarkmenu = new BookmarkMenu( Globalx.num, part )
+
         Globalx[ part ].sidemenu = new SideMenu( Globalx.num, part )
         Globalx[ part ].sidemenu.setup(`#${part}-side`)
-        Globalx[ part ].bookmarkmenu.set_click_handler()
-        Globalx[ part ].bookmarkmenu.rebuild_bookmark_menu(part)
 
         $( Globalx[ part ].download_sel ).on('click', {num: Globalx.num, part: part}, handleDownload)
         $( Globalx[ part ].textarea_sel ).val("");
+        Globalx.bookmarkmenu.rebuild_bookmark_menu(part)
+        Globalx.bookmarkmenu.set_click_handler(part)
     } )
-/*
-    Globalx.parts.map( (part) => {
-        Globalx[ part ].sidemenu.setup(`#${part}-side`)
-        Globalx[ part ].bookmarkmenu.rebuild_bookmark_menu(part)
 
-        $( Globalx[part].download_sel ).on('click', {num: Globalx.num, part: part}, handleDownload)
-        $( Globalx[part].textarea_sel ).val("");
-    }
-  */  
     if( need_to_save ){
         // LocalStorageにまだ保存していない場合、ここで保存しておく
@@ -58 +87 @@
         Globalx.storagex.save_as_info_from_globalx( (data) => { console.log( "data=" + data ) } )
     }
-
-    let part = "data"
-    $( '#bookmark_displayname' ).prop( 'maxlength' , Globalx.bookmark_displayname_max_length)
-    $('#bookmarkDlg').dialog({
-        autoOpen: false,
-        modal: true,
-        buttons: {
-            "OK": function() {
-                part = Globalx.parts[ Globalx.index ]
-                path = $( '#bookmark_path' ).val()
-                displayname = $( '#bookmark_displayname' ).val()
-                register_bookmark_( part , path, displayname )
-                $(this).dialog("close")},
-            "Cancel": function() {
-                bookmark_cb.prop('checked', false)
-                $(this).dialog("close")
-            }
-        }
-    }) 
+/*
+    Object.keys(Globalx).forEach((key) => {
+        console.log(key)
+    }) */
 }
 
@@ -83 +97 @@
       Globalx[part] = {
           editor_id: `${part}-editor`,
-          editor: null,
+          editor: null, /* variable */
           textarea_sel: `textarea[name=${part}-editor-t`,
 /**/
@@ -91 +105 @@
           item_name: "",
 /**/
-          bookmarks: [],
-          key_indicate_file: false,
-          key: '/',
+          bookmarks: [], 
+          key_indicate_file: false, /* variable */
+          key: '/', 
           key_sel: `#${part}-filelist_key`,
-          download_sel: `#${part}-down-download`
+          download_sel: `#${part}-down-download`,
+          download_url_sel: `#${part}-down-url`,
+          download_partial_url_sel: `#${part}-partial-down-url`
       }
       editor_config(part);
@@ -102 +118 @@
       Globalx[part].bookmark_sel = `#${Globalx[part].bookmark_id}`
       Globalx[part].bookmark_op_sel = `#${Globalx[part].bookmark_op_id}`
-      Globalx[part].bookmark_mgr = new BookmarkMgr( Globalx.bookmark_displayname_max_length )
 }
 
@@ -113 +128 @@
       editor.getSession().setTabSize(2);
       Globalx[part].editor = editor;
-      let textarea = $( Globalx[part].textarea_sel );
-      Globalx[part].textarea = textarea;
-      editor.getSession().on("change", function () {
-          Globalx[part].textarea.val(editor.getSession().getValue());
+
+      let textarea = $( Globalx[part].textarea_sel )
+      editor.getSession().on("change", (textarea) => {
+          textarea.val(editor.getSession().getValue());
       });
 }