diff --git a/src/messenger/webim/js/164/brws.js b/src/messenger/webim/js/compiled/brws.js similarity index 100% rename from src/messenger/webim/js/164/brws.js rename to src/messenger/webim/js/compiled/brws.js diff --git a/src/messenger/webim/js/164/chatcontroller.js b/src/messenger/webim/js/compiled/chatcontroller.js similarity index 100% rename from src/messenger/webim/js/164/chatcontroller.js rename to src/messenger/webim/js/compiled/chatcontroller.js diff --git a/src/messenger/webim/js/164/chatinit.js b/src/messenger/webim/js/compiled/chatinit.js similarity index 100% rename from src/messenger/webim/js/164/chatinit.js rename to src/messenger/webim/js/compiled/chatinit.js diff --git a/src/messenger/webim/js/164/chatserver.js b/src/messenger/webim/js/compiled/chatserver.js similarity index 100% rename from src/messenger/webim/js/164/chatserver.js rename to src/messenger/webim/js/compiled/chatserver.js diff --git a/src/messenger/webim/js/164/chatview.js b/src/messenger/webim/js/compiled/chatview.js similarity index 100% rename from src/messenger/webim/js/164/chatview.js rename to src/messenger/webim/js/compiled/chatview.js diff --git a/src/messenger/webim/js/164/common.js b/src/messenger/webim/js/compiled/common.js old mode 100755 new mode 100644 similarity index 100% rename from src/messenger/webim/js/164/common.js rename to src/messenger/webim/js/compiled/common.js diff --git a/src/messenger/webim/js/164/handlebars_helpers.js b/src/messenger/webim/js/compiled/handlebars_helpers.js similarity index 100% rename from src/messenger/webim/js/164/handlebars_helpers.js rename to src/messenger/webim/js/compiled/handlebars_helpers.js diff --git a/src/messenger/webim/js/164/ie.js b/src/messenger/webim/js/compiled/ie.js similarity index 100% rename from src/messenger/webim/js/164/ie.js rename to src/messenger/webim/js/compiled/ie.js diff --git a/src/messenger/webim/js/164/invite_op.js b/src/messenger/webim/js/compiled/invite_op.js similarity index 100% rename from src/messenger/webim/js/164/invite_op.js rename to src/messenger/webim/js/compiled/invite_op.js diff --git a/src/messenger/webim/js/164/leavemessage.js b/src/messenger/webim/js/compiled/leavemessage.js similarity index 100% rename from src/messenger/webim/js/164/leavemessage.js rename to src/messenger/webim/js/compiled/leavemessage.js diff --git a/src/messenger/webim/js/164/locale.js b/src/messenger/webim/js/compiled/locale.js similarity index 100% rename from src/messenger/webim/js/164/locale.js rename to src/messenger/webim/js/compiled/locale.js diff --git a/src/messenger/webim/js/164/messageview.js b/src/messenger/webim/js/compiled/messageview.js similarity index 100% rename from src/messenger/webim/js/164/messageview.js rename to src/messenger/webim/js/compiled/messageview.js diff --git a/src/messenger/webim/js/164/mibewapi.js b/src/messenger/webim/js/compiled/mibewapi.js similarity index 100% rename from src/messenger/webim/js/164/mibewapi.js rename to src/messenger/webim/js/compiled/mibewapi.js diff --git a/src/messenger/webim/js/164/pluginmanager.js b/src/messenger/webim/js/compiled/pluginmanager.js similarity index 100% rename from src/messenger/webim/js/164/pluginmanager.js rename to src/messenger/webim/js/compiled/pluginmanager.js diff --git a/src/messenger/webim/js/164/soundcheck.js b/src/messenger/webim/js/compiled/soundcheck.js similarity index 100% rename from src/messenger/webim/js/164/soundcheck.js rename to src/messenger/webim/js/compiled/soundcheck.js diff --git a/src/messenger/webim/js/164/survey.js b/src/messenger/webim/js/compiled/survey.js similarity index 100% rename from src/messenger/webim/js/164/survey.js rename to src/messenger/webim/js/compiled/survey.js diff --git a/src/messenger/webim/js/164/thread.js b/src/messenger/webim/js/compiled/thread.js similarity index 100% rename from src/messenger/webim/js/164/thread.js rename to src/messenger/webim/js/compiled/thread.js diff --git a/src/messenger/webim/js/164/update.js b/src/messenger/webim/js/compiled/update.js similarity index 100% rename from src/messenger/webim/js/164/update.js rename to src/messenger/webim/js/compiled/update.js diff --git a/src/messenger/webim/js/164/users.js b/src/messenger/webim/js/compiled/users.js similarity index 100% rename from src/messenger/webim/js/164/users.js rename to src/messenger/webim/js/compiled/users.js diff --git a/src/messenger/webim/js/source/build.xml b/src/messenger/webim/js/source/build.xml index 7d2e2573..3c1f8fe4 100644 --- a/src/messenger/webim/js/source/build.xml +++ b/src/messenger/webim/js/source/build.xml @@ -2,7 +2,7 @@ - + @@ -52,11 +52,6 @@ - - - - - diff --git a/src/messenger/webim/libs/common/constants.php b/src/messenger/webim/libs/common/constants.php index 730347ab..e56999d3 100644 --- a/src/messenger/webim/libs/common/constants.php +++ b/src/messenger/webim/libs/common/constants.php @@ -20,11 +20,6 @@ */ $version = '1.6.5'; -/** - * Current version of Mibew Messenger's JavaScript - */ -$jsver = "164"; - /** * Current version of database structure */ diff --git a/src/messenger/webim/libs/common/misc.php b/src/messenger/webim/libs/common/misc.php index 0e741a21..cb1e2248 100644 --- a/src/messenger/webim/libs/common/misc.php +++ b/src/messenger/webim/libs/common/misc.php @@ -45,8 +45,7 @@ function get_gifimage_size($filename) function jspath() { - global $jsver; - return "js/$jsver"; + return "js/compiled"; } function div($a, $b) diff --git a/src/messenger/webim/libs/expand.php b/src/messenger/webim/libs/expand.php index 224dd256..ed69f702 100644 --- a/src/messenger/webim/libs/expand.php +++ b/src/messenger/webim/libs/expand.php @@ -42,14 +42,12 @@ function expand_condition($matches) function expand_var($matches) { - global $page, $webimroot, $jsver, $errors, $current_style; + global $page, $webimroot, $errors, $current_style; $prefix = $matches[1]; $var = $matches[2]; if (!$prefix) { if ($var == 'webimroot') { return $webimroot; - } else if ($var == 'jsver') { - return $jsver; } else if ($var == 'tplroot') { return "$webimroot/styles/dialogs/$current_style"; } else if ($var == 'styleid') { diff --git a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl index 7e809800..32ef5053 100644 --- a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl +++ b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl @@ -5,17 +5,17 @@ ${page:additional_css} - + - + ${page:additional_js} - + - - + + - + + + - + ${page:additional_js} - + - - + + - + + + - + ${page:additional_js} - +
diff --git a/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl index 4123a86f..7d798f57 100644 --- a/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl @@ -4,8 +4,8 @@ ${msg:leavemessage.title} - - + + - + + + - + ${page:additional_js} - +