Commit 6afbd0d4 by Kim Peace

Revert union to import js but it just arranged

parent 8c0c69a1
......@@ -93,8 +93,26 @@
<div id="loadingArea"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- view -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
......
......@@ -65,8 +65,26 @@
<!-- ローディング -->
<div id="userProfileModal"></div>
<!-- import js -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- view -->
<script src="./js/archive.js"></script>
......
......@@ -47,9 +47,9 @@
<main id="chat">
<!-- ユーザー検索 -->
<div class="search_form">
<input type="search" name="search" placeholder="ルーム検索" maxlength="20">
<span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a>
<input type="search" name="search" placeholder="ルーム検索" maxlength="20">
<span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a>
</div>
<!-- タブ -->
<div class="content tabs">
......@@ -97,16 +97,34 @@
</div>
</div>
</footer>
<div id="loadingArea"></div>
<div id="loadingArea"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
<script>
String.prototype.replaceAll = function(org, dest) {
<script>
String.prototype.replaceAll = function (org, dest) {
return this.split(org).join(dest);
}
let CHAT_SERVER_URL = '';
......@@ -116,7 +134,7 @@
let IS_MOBILE = true;
let IS_ONLINE = false;
$("#loadingArea").load("./loading.html");
if (typeof(android) != "undefined") {
if (typeof (android) != "undefined") {
android.getLoginParameter();
android.getGlobalParameter();
android.saveSelectedUserList("");
......@@ -140,7 +158,7 @@
CHAT_UI.refreshRoomList(ChatRoomType.GROUP);
CHAT_UI.dismissLoadingIndicator();
};
</script>
</script>
</body>
</html>
\ No newline at end of file
......@@ -127,8 +127,26 @@
</form>
</main>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
......
......@@ -57,8 +57,26 @@
</form>
</main>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
......
......@@ -56,8 +56,26 @@
</div>
</main>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
......
......@@ -128,8 +128,26 @@
</form>
</main>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
......
......@@ -64,8 +64,26 @@
</div>
</main>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
......
......@@ -144,8 +144,28 @@
<div id="chatMenuModal"></div>
<div id="pictureModal"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- Socket -->
<script src="./js/chat-websocket.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
......
......@@ -125,15 +125,35 @@
</div>
</div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- Socket -->
<script src="./js/chat-websocket.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
<script src="./js/collaboration.js"></script>
<script src="https://biztaskyell.abookcloud.com/coview_api.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.html");
......
......@@ -69,8 +69,28 @@
</div>
</div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- Socket -->
<script src="./js/chat-websocket.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
......
......@@ -129,8 +129,28 @@
<!-- フッター -->
<div id="footer_collabo"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- Socket -->
<script src="./js/chat-websocket.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
......
......@@ -119,8 +119,28 @@
<!-- フッター -->
<div id="footer_collabo"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- Socket -->
<script src="./js/chat-websocket.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
......
......@@ -64,8 +64,28 @@
<!-- フッター -->
<div id="footer_collabo"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- Socket -->
<script src="./js/chat-websocket.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
......
......@@ -121,8 +121,28 @@
<!-- フッター -->
<div id="footer_collabo"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- Socket -->
<script src="./js/chat-websocket.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
......
......@@ -175,9 +175,27 @@
<div id="loadingArea"></div>
<div id="myProfileModal"></div>
<div id="userProfileModal"></div>
<!-- Import JS -->
<script src="./js/common-js-importer.js"></script>
<!-- Library -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/moment.js"></script>
<script src="./js/libs/locale/ko.js" charset="UTF-8"></script>
<script src="./js/libs/locale/ja.js" charset="UTF-8"></script>
<script src="./js/libs/mustache.min.js"></script>
<script src="./js/libs/bootstrap.min.js"></script>
<script src="./js/libs/jquery.mark.min.js"></script>
<!-- Language -->
<script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<!-- Common -->
<script src="./js/constant.js"></script>
<script src="./js/common.js"></script>
<script src="./js/chat-util.js"></script>
<!-- Model -->
<script src="./js/chat-db.js"></script>
<script src="./js/chat-db-foriOS.js"></script>
<!-- View -->
<script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script>
......
// 名前空間
var CHAT_DB = {};
includeJs("./js/chat-db-foriOS.js");
//ロカールDBからルーム一覧情報を取得
CHAT_DB.getRoomList = function (roomType, keyWord) {
if (CHAT_UTIL.isIOS()) {
......
......@@ -2,8 +2,6 @@ var socket;
// 名前空間
var CHAT_SOCKET = {};
includeJs("./js/libs/socket.io.js");
includeJs("./js/chat-websocket-message.js");
includeJs("./js/chat-websocket-refresh-group-list.js");
includeJs("./js/chat-websocket-refresh-user-list-in-group.js");
......
function includeJs(jsFilePath, charset = "") {
var js = document.createElement("script");
js.type = "text/javascript";
if (charset != "") {
js.charset = charset;
}
js.src = jsFilePath;
document.body.appendChild(js);
}
// Library
includeJs("./js/libs/jquery-3.3.1.min.js");
includeJs("./js/libs/moment.js");
includeJs("./js/libs/locale/ko.js", "UTF-8");
includeJs("./js/libs/locale/ja.js", "UTF-8");
includeJs("./js/libs/mustache.min.js");
includeJs("./js/libs/bootstrap.min.js");
includeJs("./js/libs/jquery.mark.min.js");
// Language
includeJs("./js/language.js");
includeJs("./js/language_ko.js", "UTF-8");
includeJs("./js/language_ja.js", "UTF-8");
includeJs("./js/language_en.js", "UTF-8");
// Common
includeJs("./js/constant.js");
includeJs("./js/common.js");
includeJs("./js/chat-util.js");
// Model
includeJs("./js/chat-db.js");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment