diff --git a/assets/css/components/conversations/manager.css b/assets/css/components/conversations/manager.css index 39ded65b..52e4584c 100644 --- a/assets/css/components/conversations/manager.css +++ b/assets/css/components/conversations/manager.css @@ -19,4 +19,9 @@ border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; vertical-align: bottom; + + padding-left: 6px; + padding-right: 6px; + padding-top: 3px; + padding-bottom: 3px; } \ No newline at end of file diff --git a/assets/js/common/system.js b/assets/js/common/system.js index 1f7e9549..a56fd426 100644 --- a/assets/js/common/system.js +++ b/assets/js/common/system.js @@ -71,7 +71,7 @@ ComunicWeb.common.system = { */ var autoRefresh = setInterval((function(){ ComunicWeb.user.userLogin.refreshLoginState(); - }), 20000); + }), 25000); ComunicWeb.common.cacheManager.registerInterval(autoRefresh); //Success diff --git a/assets/js/common/utils.js b/assets/js/common/utils.js index 16e43227..636dba6a 100644 --- a/assets/js/common/utils.js +++ b/assets/js/common/utils.js @@ -266,7 +266,7 @@ function createFormGroup(infos){ function checkString(value){ //First, check string length - if(value.length < 5) + if(value.length < 3) return false; //Lenght invalid //Success, the string seems to be valid diff --git a/assets/js/components/conversations/manager.js b/assets/js/components/conversations/manager.js index 9f41fb45..17202a1e 100644 --- a/assets/js/components/conversations/manager.js +++ b/assets/js/components/conversations/manager.js @@ -73,6 +73,9 @@ ComunicWeb.components.conversations.manager = { ComunicWeb.components.conversations.chatWindows.openConversation(openedConversations[i]); } + //Intializate conversation service + ComunicWeb.components.conversations.service.init(); + }, /** @@ -86,7 +89,7 @@ ComunicWeb.components.conversations.manager = { //Create the button var addButton = createElem("button", targetElem); addButton.className = "btn btn-primary open-conversation-button"; - addButton.innerHTML = "Open a conversation"; + addButton.innerHTML = "Conversations"; //Make button lives diff --git a/assets/js/components/conversations/service.js b/assets/js/components/conversations/service.js index 2c3100ad..2a483ed0 100644 --- a/assets/js/components/conversations/service.js +++ b/assets/js/components/conversations/service.js @@ -7,5 +7,39 @@ */ ComunicWeb.components.conversations.service = { + + /** + * @var {Integer} intervalID The ID of the current service interval + */ + __intervalID: false, + + /** + * Initializate conversation service + * + * @return {Boolean} True for a success + */ + init: function(){ + //Check if an interval already exists or not + if(this.__intervalID) + clearInterval(this.__intervalID); //Remove old interval + + //Initializate interval + this.__intervalID = setInterval(function(){ + ComunicWeb.components.conversations.service.call(); + }, 1500); + ComunicWeb.common.cacheManager.registerInterval(this.__intervalID); + + //Success + return true; + }, + + /** + * Call this service + * + * @return {Boolean} True for a success + */ + call: function(){ + console.log("Conversation service called !"); + } } \ No newline at end of file