X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Finstall%2Finstall.js;h=51b69cc2a8bd4e207a3aac038fcc893dfeca87ca;hb=d16ae06f1ba8e90e23b3c337d947bc63f1f69983;hp=1da9f0340714d9fe591468051d06538add92d338;hpb=70323b78ab00bdecff82a1cb6a025ca5da80103c;p=kit%2Fkit.git

diff --git a/app/install/install.js b/app/install/install.js
index 1da9f03..51b69cc 100644
--- a/app/install/install.js
+++ b/app/install/install.js
@@ -1,8 +1,10 @@
-( (_pid) => {
+( (_pid, _app) => {
     let iobj = new Object();
-    S.dom( _pid, "#install-define-decide").on("click", ()=>{
-        let define_path = S.dom( _pid, "#install-define-path").val();
-        if( define_path.length == 0 ){
+    _app.data("appname", "");
+
+    _app.event("define-decide", () => {
+        let define_path = _app.data("path");
+        if( !define_path || define_path.length == 0 ){
             S.alert("インストーラー", "define.jsonのパスを入力してください。");
             return;
         }
@@ -11,37 +13,28 @@
             iobj.path = define_path;
             iobj.id = data.id;
 
-            S.dom( _pid, "#install-appid" ).val( data.id );
-            S.dom( _pid, "#install-name" ).val( data.name );
-            S.dom( _pid, "#install-icon" ).val( define_path + data.icon );
+            _app.dom( "#install-appid" ).val( data.id );
+            _app.dom( "#install-name" ).val( data.name );
+            _app.dom( "#install-icon" ).val( define_path + data.icon );
 
-            S.dom( _pid, "#install-prot1").hide();
-            S.dom( _pid, "#install-prot2").show();
+            _app.dom( "#install-prot1").hide();
+            _app.dom( "#install-prot2").show();
         }).fail( function() {
             S.alert("読み込みに失敗", "define.jsonが存在しないか、アクセスできません。");
         } );
     });
 
-    S.dom( _pid, "#install-start" ).on("click", ()=>{
+    _app.event("start", () => {
         iobj.name = S.dom( _pid, "#install-name" ).val();
         iobj.icon = S.dom( _pid, "#install-icon" ).val();
 
-        console.log(iobj);
-
         System.installed.push(iobj);
         localStorage.setItem("kit-installed", JSON.stringify(System.installed));
 
-
-        S.dom( _pid, "#install-done-name" ).text( iobj.name );
-
-        S.dom( _pid, "#install-prot2").hide();
-        S.dom( _pid, "#install-prot3").show();
+        _app.data("appname", iobj.name);
+        _app.dom( "#install-prot2").hide();
+        _app.dom( "#install-prot3").show();
 
         $.getJSON("config/apps.json", System.initLauncher);
     });
-
-    S.dom( _pid, "#install-close" ).on("click", ()=>{
-        System.close(_pid);
-    })
-
-} )(pid);
\ No newline at end of file
+} )(pid, app);
\ No newline at end of file