瀏覽代碼

Fix Chat bug

causefx 8 年之前
父節點
當前提交
f8e13a6507
共有 2 個文件被更改,包括 20 次插入17 次删除
  1. 17 10
      chatjs.php
  2. 3 7
      index.php

+ 17 - 10
chatjs.php

@@ -717,7 +717,8 @@ $(document).ready(function()
     window.onload = function()
     {
         tabinfocus = true;
-        console.log("chat started");
+        window.chatLoaded = false;
+        console.log("loading chat");
         setTimeout(function() {
             if ($('.chat-box').hasClass('email-active')){
                 tabinfocus = true;
@@ -727,27 +728,33 @@ $(document).ready(function()
                 tabinfocus = false;
                 console.log("not in focus");
             }
+            window.chatLoaded = true;
+            console.log("chat started");
         }, 5000);
 
     };
 
     window.onfocus = function()
     {
-        if ($('.chat-box').hasClass('email-active')){
-            tabinfocus = true;
-            $(".mdi-forum").removeClass("tada loop-animation new-message");//SET MESSAGE TO ZERO
-            console.log("in focus");
-        }else{
-            tabinfocus = false;
-            console.log("not in focus");
+        if(window.chatLoaded === true){
+            if ($('.chat-box').hasClass('email-active')){
+                tabinfocus = true;
+                $(".mdi-forum").removeClass("tada loop-animation new-message");//SET MESSAGE TO ZERO
+                console.log("in focus");
+            }else{
+                tabinfocus = false;
+                console.log("not in focus");
+            }
         }
  
     };
     
     window.onblur = function()
     {
-        tabinfocus = false;
-        console.log("not in focus");
+        if(window.chatLoaded === true){
+            tabinfocus = false;
+            console.log("not in focus");
+        }
     };
     
     // new message tab alert

+ 3 - 7
index.php

@@ -64,15 +64,11 @@ if (file_exists('config/config.php')) {
 	}
 
 	$configReady = "Yes";
-
 	require_once("user.php");
-
 	$USER = new User("registration_callback");
-
+	
 	$dbfile = DATABASE_LOCATION  . constant('User::DATABASE_NAME') . ".db";
-
 	$database = new PDO("sqlite:" . $dbfile);
-
 	$query = "SELECT * FROM users";
 
 	foreach($database->query($query) as $data) {
@@ -1333,13 +1329,13 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 
 		var update = function () {
 			date = moment(new Date())
-			datetime.html(date.format('h:mm A'));
+			datetime.html(date.format('ddd MMM DD YYYY h:mm A'));
 		};
 		 //Current Time
 		 datetime = $('.current-time')
 		update();
 		setInterval(update, 60000);
-		console.log(datetime);
+		console.log(date);
 		//Tooltips
 		$('[data-toggle="tooltip"]').tooltip();
 		$(".box").niceScroll({