1.4.0_miura_#44124 初回起動のみカテゴリーが小さく表示されるバグを修正

b3b37e64 · Takatoshi Miura · 7ad798e8 · b3b37e64 · b3b37e64
Commit b3b37e64 authored 3 years ago by Takatoshi Miura
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 9 deletions

app/index.html
+1 -1

app/script/check.js
+14 -8

No files found.
--- a/app/index.html
+++ b/app/index.html
@@ -20,7 +20,7 @@
 <body onload="CHK_L.init();" style="position: relative; margin-top: 53px;">
    <header style="position: fixed; width: 100%; top: 0px; left: 0; z-index: 999;">
        <nav class="navbar navbar-dark bg-primary">
-            <a class="navbar-brand category-btn lht-0" href="#" >
+            <a class="navbar-brand category-btn lht-0" href="javascript:CHK.setCategoryHeight();">
                <i class="fa fa-folder fs-12 p-1" id="category-toggle-button"></i>
                <span class="d-none d-md-inline fs-10">カテゴリー</span>
            </a>

--- a/app/script/check.js
+++ b/app/script/check.js
@@ -412,14 +412,6 @@ CHK.initReportApp = function (callback) {
        CHK.operation.searchOperationList = json.operationList;
 		//作業一覧描画
 		CHK.createOperationList(CHK.operation.operationList);
-		//カテゴリー高さ固定
-		if(isSetCategory){
-			CATEGORY_HEIGHT = $('main').height();
-			console.log(CATEGORY_HEIGHT);
-			isSetCategory = false
-		}
-		$('#category-menu').height(CATEGORY_HEIGHT);
-		$('#overlayDiv').height(CATEGORY_HEIGHT);
    });

    // カテゴリーJSONデータ
@@ -441,6 +433,20 @@ CHK.initReportApp = function (callback) {
 }

 /**
+ * カテゴリー表示領域の高さ調整
+ */
+CHK.setCategoryHeight = function() {
+	//カテゴリー高さ固定
+	if(isSetCategory){
+		CATEGORY_HEIGHT = $('main').height();
+		console.log(CATEGORY_HEIGHT);
+		isSetCategory = false
+	}
+	$('#category-menu').height(CATEGORY_HEIGHT);
+	$('#overlayDiv').height(CATEGORY_HEIGHT);
+}
+
+/**
 * 作業報告初期処理、Web
 *
 * @param callback コールバック