From e5031f99879b1fff5a26abada2eb97709fb7cb79 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Thu, 4 Sep 2014 12:53:13 +0000 Subject: [PATCH] Use "mibewRoot" only in file paths --- .../js/source/chat/models/sound_managers/chat.js | 2 +- .../users/collection_views/threads_collection.js | 2 +- .../Controller/Chat/OperatorChatController.php | 3 +++ .../Mibew/Controller/Chat/UserChatController.php | 14 ++++++++++++++ .../classes/Mibew/Controller/UsersController.php | 3 +++ .../templates_src/server_side/chat.handlebars | 3 ++- .../templates_src/server_side/users.handlebars | 3 ++- 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/mibew/js/source/chat/models/sound_managers/chat.js b/src/mibew/js/source/chat/models/sound_managers/chat.js index 890d813b..b49952c6 100644 --- a/src/mibew/js/source/chat/models/sound_managers/chat.js +++ b/src/mibew/js/source/chat/models/sound_managers/chat.js @@ -70,7 +70,7 @@ playNewMessageSound: function() { if (! this.get('skipNextMessageSound')) { // Build sound path - var path = Mibew.Objects.Models.page.get('mibewRoot'); + var path = Mibew.Objects.Models.page.get('mibewBasePath'); if (typeof path !== 'undefined') { path += '/sounds/new_message'; // Play sound diff --git a/src/mibew/js/source/users/collection_views/threads_collection.js b/src/mibew/js/source/users/collection_views/threads_collection.js index 6b5cdfda..58494e43 100644 --- a/src/mibew/js/source/users/collection_views/threads_collection.js +++ b/src/mibew/js/source/users/collection_views/threads_collection.js @@ -165,7 +165,7 @@ */ threadAdded: function() { // Build sound path - var path = Mibew.Objects.Models.page.get('mibewRoot'); + var path = Mibew.Objects.Models.page.get('mibewBasePath'); if (typeof path !== 'undefined') { path += '/sounds/new_user'; // Play sound diff --git a/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php b/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php index b5a5687c..b3ba47b0 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php @@ -70,6 +70,9 @@ class OperatorChatController extends AbstractController // Build js application options $page['chatOptions'] = json_encode($page['chat']); + $page['mibewBasePath'] = $request->getBasePath(); + $page['mibewBaseUrl'] = $request->getBaseUrl(); + // Render the page with chat. return $this->render('chat', $page); } diff --git a/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php b/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php index 41441f2b..c713011c 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Chat/UserChatController.php @@ -56,6 +56,9 @@ class UserChatController extends AbstractController // Build js application options $page['chatOptions'] = json_encode($page['chat']); + $page['mibewBasePath'] = $request->getBasePath(); + $page['mibewBaseUrl'] = $request->getBaseUrl(); + // Expand page return $this->render('chat', $page); } @@ -141,6 +144,10 @@ class UserChatController extends AbstractController $group_id, $info, $referrer + ), + array( + 'mibewBasePath' => $request->getBasePath(), + 'mibewBaseUrl' => $request->getBaseUrl(), ) ); $page['leaveMessageOptions'] = json_encode($page['leaveMessage']); @@ -173,6 +180,10 @@ class UserChatController extends AbstractController $group_id, $info, $referrer + ), + array( + 'mibewBasePath' => $request->getBasePath(), + 'mibewBaseUrl' => $request->getBaseUrl(), ) ); $page['surveyOptions'] = json_encode($page['survey']); @@ -239,6 +250,9 @@ class UserChatController extends AbstractController // Build js application options $page['invitationOptions'] = json_encode($page['invitation']); + $page['mibewBasePath'] = $request->getBasePath(); + $page['mibewBaseUrl'] = $request->getBaseUrl(); + // Expand page return $this->render('chat', $page); } diff --git a/src/mibew/libs/classes/Mibew/Controller/UsersController.php b/src/mibew/libs/classes/Mibew/Controller/UsersController.php index 5fe96cad..56810f2b 100644 --- a/src/mibew/libs/classes/Mibew/Controller/UsersController.php +++ b/src/mibew/libs/classes/Mibew/Controller/UsersController.php @@ -60,6 +60,9 @@ class UsersController extends AbstractController $page['inviteLink'] = $request->getBaseUrl() . '/operator/invite'; $page['agentLink'] = $request->getBaseUrl() . '/operator/chat'; + $page['mibewBasePath'] = $request->getBasePath(); + $page['mibewBaseUrl'] = $request->getBaseUrl(); + // Load dialogs style options $chat_style = new ChatStyle(ChatStyle::getCurrentStyle()); $style_config = $chat_style->getConfigurations(); diff --git a/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars b/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars index 59d18bb0..b2b116aa 100644 --- a/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars +++ b/src/mibew/styles/dialogs/default/templates_src/server_side/chat.handlebars @@ -82,7 +82,8 @@ }, page: { style: '{{styleName}}', - mibewRoot: '{{mibewRoot}}', + mibewBasePath: '{{mibewBasePath}}', + mibewBaseUrl: '{{mibewBaseUrl}}', stylePath: '{{stylePath}}', company: { name: '{{#jsString}}{{company.name}}{{/jsString}}', diff --git a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars index 259f7c2b..53ff7626 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars @@ -89,7 +89,8 @@ }, page: { - mibewRoot: "{{mibewRoot}}", + mibewBasePath: "{{mibewBasePath}}", + mibewBaseUrl: "{{mibewBaseUrl}}", showOnlineOperators: {{#if showonline}}true{{else}}false{{/if}}, showVisitors: {{#if showvisitors}}true{{else}}false{{/if}},