OSDN Git Service

v1.5.6
[serene/MyBrowser.git] / app / pages / home.html
index e467fec..231e0f1 100644 (file)
@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>ホーム</title>
-    <link href="my://style.css" type="text/css" rel="stylesheet" />
+    <link href="flast://style.css" type="text/css" rel="stylesheet" />
     <script>
-        if (getDarkTheme()) {
+        if (getDarkTheme() || navigator.userAgent.indexOf('PrivMode') != -1) {
             document.write(
                 `<link href="https://stackpath.bootstrapcdn.com/bootswatch/3.4.1/darkly/bootstrap.min.css" type="text/css" rel="stylesheet" integrity="sha384-pKJMCXwCXq3HwRBt27cwwSmc0/DAo2BjRxGd7nEESEStk++p6LffHmhX9oqzVDUk" crossorigin="anonymous" />`
             );
         }
     </script>
     <link href="http://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.min.css" type="text/css" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css?family=Noto+Sans|Noto+Sans+JP|Roboto" type="text/css" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans|Noto+Sans+JP|Roboto" type="text/css"
+        rel="stylesheet" />
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" type="text/css" rel="stylesheet" />
-    <link rel="icon" sizes="any" href="my://public.svg" type="image/svg+xml">
-    <link rel="mask-icon" href="my://public.svg" color="black">
+    <link rel="icon" sizes="any" href="flast://public.svg" type="image/svg+xml">
+    <link rel="mask-icon" href="flast://public.svg" color="black">
 </head>
 
 <body style="padding-top: 75px;">
@@ -32,8 +33,8 @@
                 <a class="navbar-brand">
                     <script>document.write(getAppName());</script></a>
                 <div class="navbar-form navbar-right" role="search" style="width: 75%;">
-                    <input class="form-control" id="search" placeholder="Google で検索または URL を入力" style="width: 90%;"
-                        onkeydown="handleKeydown();">
+                    <input class="form-control" id="search" placeholder="Google で検索または URL を入力"
+                        style="width: calc(100% - 120px);" onkeydown="handleKeydown();">
                     <button type="submit" class="btn btn-default">Search</button>
                 </div>
             </div>
             <div class="col-md-3">
                 <ul class="nav nav-pills nav-stacked">
                     <li>
-                        <a href="my://home/">
+                        <a href="flast://home/">
                             <i class="material-icons" style="vertical-align: text-bottom; font-size: 16px;">home</i>
                             ホーム
                         </a>
                     </li>
                     <hr>
                     <li>
-                        <a href="my://history/" target="_blank">
+                        <a href="flast://history/" target="_blank">
                             <i class="material-icons" style="vertical-align: text-bottom; font-size: 16px;">history</i>
                             履歴
                         </a>
                     </li>
                     <li>
-                        <a href="my://downloads/" target="_blank">
+                        <a href="flast://downloads/" target="_blank">
                             <i class="material-icons" style="vertical-align: text-bottom; font-size: 16px;">get_app</i>
                             ダウンロード
                         </a>
                     </li>
                     <li>
-                        <a href="my://bookmarks/" target="_blank">
+                        <a href="flast://bookmarks/" target="_blank">
                             <i class="material-icons"
                                 style="vertical-align: text-bottom; font-size: 16px;">bookmarks</i> ブックマーク
                         </a>
                     </li>
                     <li>
-                        <a href="my://store/" target="_blank">
+                        <a href="flast://store/" target="_blank">
                             <i class="material-icons" style="vertical-align: text-bottom; font-size: 16px;">shop</i>
                             WebApp Store
                         </a>
                             設定
                         </a>
                         <ul class="dropdown-menu" style="width: 100%;">
-                            <li><a href="my://settings/" target="_blank">ホーム</a></li>
+                            <li><a href="flast://settings/" target="_blank">ホーム</a></li>
                             <li class="divider"></li>
-                            <li><a href="my://settings/#design" target="_blank">デザイン</a></li>
-                            <li><a href="my://settings/#engine" target="_blank">検索エンジン</a></li>
-                            <li><a href="my://settings/#adblock" target="_blank">広告ブロック</a></li>
-                            <li><a href="my://settings/#window" target="_blank">ウィンドウ</a></li>
+                            <li><a href="flast://settings/#design" target="_blank">デザイン</a></li>
+                            <li><a href="flast://settings/#engine" target="_blank">検索エンジン</a></li>
+                            <li><a href="flast://settings/#adblock" target="_blank">広告ブロック</a></li>
+                            <li><a href="flast://settings/#window" target="_blank">ウィンドウ</a></li>
                             <li class="divider"></li>
-                            <li><a href="my://settings/#about" target="_blank">
+                            <li><a href="flast://settings/#about" target="_blank">
                                     <script>document.write(getAppName());</script> について</a></li>
                         </ul>
                     </li>
                     <li>
-                        <a href="my://help/" target="_blank">
+                        <a href="flast://help/" target="_blank">
                             <i class="material-icons"
                                 style="vertical-align: text-bottom; font-size: 16px;">help_outline</i> ヘルプ
                         </a>
                             localStorage.setItem('isFirst', false);
                         }
                     </script>
+                    <h3>ホーム</h3>
+                    <hr>
                     <script>
                         if (navigator.userAgent.indexOf('PrivMode') != -1) {
                             document.write(
-                                `<h5>プライベート モード</h5>
-                                        <hr>
-                                        <p>
-                                            現在、プライベート モードで閲覧しています。プライベート モードでは、閲覧履歴やCookieなどが${getAppName()}に保存されません。<br>
+                                `<div class="panel panel-default" id="normal">
+                                    <div class="panel-heading">プライベート モード</div>
+                                    <div class="panel-body">
+                                            現在、プライベート モードで閲覧しています。<br>
+                                            プライベート モードでは、閲覧履歴やCookieなどが${getAppName()}に保存されません。<br>
                                             また、ブックマークはプライベート ブックマークに保存されます。<br>
                                             ※ プライベート ブックマークは、プライベート モードの時のみブックマークの表示や編集ができる機能です。<br>
                                             ただし、ダウンロードしたファイルは通常通り保存されます。<br><br>
                                                 <li>Cookieとサイトデータ</li>
                                                 <li>ログイン情報</li>
                                             </ul>
-                                        </p>`
+                                            ${getAppName()} に<b>以下の情報は</b>保存されます。<br>
+                                            <ul>
+                                                <li>ダウンロード情報</li>
+                                                <li>プライベート ブックマーク</li>
+                                            </ul>
+                                    </div>
+                                </div>`
                             );
                         }
                     </script>
-                    <h3>ホーム</h3>
-                    <hr>
                     <div class="panel panel-default" id="normal">
                         <div class="panel-heading">
                             最近の履歴
-                            <a href="my://history" target="_blank" class="text-muted"
+                            <a href="flast://history" target="_blank" class="text-muted"
                                 style="float: right;">すべての履歴を表示</a>
                         </div>
                         <div class="panel-body">
                                 <table class="table table-striped table-hover table-style" id="historyList">
                                     <thead>
                                         <tr>
+                                            <th class="table-icon"></th>
                                             <th class="table-title">タイトル</th>
                                             <th class="table-url">URL</th>
-                                            <th style="width: 200px; white-space: nowrap;">閲覧日時</th>
+                                            <th class="table-date">閲覧日時</th>
                                         </tr>
                                     </thead>
                                     <tbody>
                 let v = 0;
                 data.forEach((item, i) => {
                     if (v > 9) return;
-                    $('#historyList').append($('<tr></tr>').append($('<td class="table-title"></td>').append($(`<a href="${item.url}"></a>`).text(item.title))).append($('<td class="table-url"></td>').text(item.url)).append($('<td></td>').text(moment(item.createdAt).format('YYYY/MM/DD HH:mm'))));
+                    $('#historyList').append(
+                        $('<tr></tr>')
+                            .append($('<td class="table-icon"></td>').append($(`<img src="http://www.google.com/s2/favicons?domain=${new URL(item.url).origin}" />`)))
+                            .append($('<td class="table-title"></td>').append($(`<a href="${item.url}"></a>`).text(item.title)))
+                            .append($('<td class="table-url"></td>').text(item.url))
+                            .append($('<td></td>').text(moment(item.createdAt).format('YYYY/MM/DD HH:mm')))
+                    );
                     v++;
                 });
             });
             let searchBar = $('#search');
             if (event.keyCode != 13 || searchBar.val().length == 0 || searchBar.val() == '') return;
 
+            /*
             if (isURL(searchBar.val())) {
                 location.href = searchBar.val();
             } else {
                 location.href = window.getSearchEngine().url.replace('%s', searchBar.val());
             }
+            */
+
+            if (isURL(searchBar.val()) && !searchBar.val().includes('://')) {
+                location.href = `http://${searchBar.val()}`;
+            } else if (!searchBar.val().includes('://')) {
+                location.href = getSearchEngine().url.replace('%s', searchBar.val());
+            } else {
+                location.href = searchBar.val();
+            }
         }
 
         function isURL(input) {
-            const pattern = /^((?:\w+:)?\/\/([^\s.]+\.\S{2}|localhost[:?\d]*)|my:\/\/\S.*)\S*$/;
+            const pattern = /^((?:\w+:)?\/\/([^\s.]+\.\S{2}|localhost[:?\d]*)|flast:\/\/\S.*)\S*$/;
 
             if (pattern.test(input)) {
                 return true;