From 1565458c268621db981c0b056ba721031d71131c Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Thu, 22 Nov 2012 10:28:22 +0000
Subject: [PATCH] Move all JavaScript files from /js/$jsver to /js/compiled

---
 src/messenger/webim/js/{164 => compiled}/brws.js       |  0
 .../webim/js/{164 => compiled}/chatcontroller.js       |  0
 src/messenger/webim/js/{164 => compiled}/chatinit.js   |  0
 src/messenger/webim/js/{164 => compiled}/chatserver.js |  0
 src/messenger/webim/js/{164 => compiled}/chatview.js   |  0
 src/messenger/webim/js/{164 => compiled}/common.js     |  0
 .../webim/js/{164 => compiled}/handlebars_helpers.js   |  0
 src/messenger/webim/js/{164 => compiled}/ie.js         |  0
 src/messenger/webim/js/{164 => compiled}/invite_op.js  |  0
 .../webim/js/{164 => compiled}/leavemessage.js         |  0
 src/messenger/webim/js/{164 => compiled}/locale.js     |  0
 .../webim/js/{164 => compiled}/messageview.js          |  0
 src/messenger/webim/js/{164 => compiled}/mibewapi.js   |  0
 .../webim/js/{164 => compiled}/pluginmanager.js        |  0
 src/messenger/webim/js/{164 => compiled}/soundcheck.js |  0
 src/messenger/webim/js/{164 => compiled}/survey.js     |  0
 src/messenger/webim/js/{164 => compiled}/thread.js     |  0
 src/messenger/webim/js/{164 => compiled}/update.js     |  0
 src/messenger/webim/js/{164 => compiled}/users.js      |  0
 src/messenger/webim/js/source/build.xml                |  7 +------
 src/messenger/webim/libs/common/constants.php          |  5 -----
 src/messenger/webim/libs/common/misc.php               |  3 +--
 src/messenger/webim/libs/expand.php                    |  4 +---
 .../webim/styles/dialogs/default/templates/chat.tpl    |  8 ++++----
 .../styles/dialogs/default/templates/chatsimple.tpl    |  2 +-
 .../styles/dialogs/default/templates/leavemessage.tpl  |  4 ++--
 .../webim/styles/dialogs/default/templates/survey.tpl  |  4 ++--
 .../webim/styles/dialogs/original/templates/chat.tpl   |  8 ++++----
 .../styles/dialogs/original/templates/chatsimple.tpl   |  2 +-
 .../styles/dialogs/original/templates/leavemessage.tpl |  4 ++--
 .../webim/styles/dialogs/original/templates/survey.tpl |  4 ++--
 .../webim/styles/dialogs/silver/templates/chat.tpl     |  8 ++++----
 .../styles/dialogs/silver/templates/leavemessage.tpl   |  4 ++--
 .../webim/styles/dialogs/silver/templates/survey.tpl   |  4 ++--
 .../webim/styles/dialogs/simplicity/templates/chat.tpl |  8 ++++----
 .../styles/dialogs/simplicity/templates/chatsimple.tpl |  2 +-
 .../dialogs/simplicity/templates/leavemessage.tpl      |  4 ++--
 .../styles/dialogs/simplicity/templates/survey.tpl     |  4 ++--
 src/messenger/webim/view/install_index.php             |  6 +++---
 src/messenger/webim/view/invite.php                    |  6 +++---
 src/messenger/webim/view/menu.php                      |  4 ++--
 src/messenger/webim/view/pending_users.php             |  6 +++---
 src/messenger/webim/view/thread_log.php                | 10 +++++-----
 src/messenger/webim/view/updates.php                   |  4 ++--
 44 files changed, 56 insertions(+), 69 deletions(-)
 rename src/messenger/webim/js/{164 => compiled}/brws.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/chatcontroller.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/chatinit.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/chatserver.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/chatview.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/common.js (100%)
 mode change 100755 => 100644
 rename src/messenger/webim/js/{164 => compiled}/handlebars_helpers.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/ie.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/invite_op.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/leavemessage.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/locale.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/messageview.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/mibewapi.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/pluginmanager.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/soundcheck.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/survey.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/thread.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/update.js (100%)
 rename src/messenger/webim/js/{164 => compiled}/users.js (100%)

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 @@
 
 <project basedir="." default="update" name="Obfuscator">
   <property name="closure.c" value="/usr/local/closure/compiler.jar" />
-  <property name="webim.location" value="../164" />
+  <property name="webim.location" value="../compiled" />
 
   <target name="update">
 	<java jar="${closure.c}" fork="true">
@@ -52,11 +52,6 @@
 		<arg value="chatserver:1:common"/>
 		  <arg value="--js"/>
 		  <arg value="chatserver.js"/>
-	</java>
-
-	<java jar="${closure.c}" fork="true">
-	  <arg value="--module_output_path_prefix"/>
-	  <arg value="../compiled/"/>
 	  <arg value="--module"/>
 		<arg value="invite:1"/>
 		  <arg value="--js"/>
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 @@
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css">
 ${page:additional_css}
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/LAB.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/json2.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/handlebars.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/handlebars_helpers.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/handlebars_helpers.js"></script>
 <script type="text/javascript" language="javascript" src="${tplroot}/js/compiled/message.tpl.js"></script>
 ${page:additional_js}
 <script type="text/javascript" language="javascript"><!--
 var chatParams = {
     cssfile: "${tplroot}/chat.css",
-    jsBasePath: "${webimroot}/js/${jsver}/",
+    jsBasePath: "${webimroot}/js/compiled/",
     localizedStrings: {closeConfirmation:"${page:chat.close.confirmation}"},
     ${if:agent}${if:canpost}
     predefinedAnswers: ${page:fullPredefinedAnswers},
@@ -39,7 +39,7 @@ var chatParams = {
 }
 //-->
 </script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/chatinit.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/chatinit.js"></script>
 <style type="text/css">
 #header{
 	height:50px;
diff --git a/src/messenger/webim/styles/dialogs/default/templates/chatsimple.tpl b/src/messenger/webim/styles/dialogs/default/templates/chatsimple.tpl
index cba5d822..9dd3b896 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/chatsimple.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/chatsimple.tpl
@@ -4,7 +4,7 @@
 <title>${msg:chat.window.title.user}</title>
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css">
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/brws.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/brws.js"></script>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000" link="#C28400" vlink="#C28400" alink="#C28400">
diff --git a/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl
index 6c931803..8ea24a1c 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl
@@ -33,8 +33,8 @@
 	position:relative;top:1px;
 }
 </style>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/leavemessage.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/leavemessage.js"></script>
 <script type="text/javascript">
 ${if:groups}
     var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/styles/dialogs/default/templates/survey.tpl b/src/messenger/webim/styles/dialogs/default/templates/survey.tpl
index 6674b34d..bfee7364 100644
--- a/src/messenger/webim/styles/dialogs/default/templates/survey.tpl
+++ b/src/messenger/webim/styles/dialogs/default/templates/survey.tpl
@@ -34,8 +34,8 @@
 	text-decoration:none;
 }
 </style>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/survey.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/survey.js"></script>
 <script type="text/javascript">
 ${if:groups}
     var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/styles/dialogs/original/templates/chat.tpl b/src/messenger/webim/styles/dialogs/original/templates/chat.tpl
index 3ffc58ed..1151aa0e 100644
--- a/src/messenger/webim/styles/dialogs/original/templates/chat.tpl
+++ b/src/messenger/webim/styles/dialogs/original/templates/chat.tpl
@@ -5,17 +5,17 @@
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css">
 ${page:additional_css}
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/LAB.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/json2.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/handlebars.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/handlebars_helpers.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/handlebars_helpers.js"></script>
 <script type="text/javascript" language="javascript" src="${tplroot}/js/compiled/message.tpl.js"></script>
 ${page:additional_js}
 <script type="text/javascript" language="javascript"><!--
 var chatParams = {
     cssfile: "${tplroot}/chat.css",
-    jsBasePath: "${webimroot}/js/${jsver}/",
+    jsBasePath: "${webimroot}/js/compiled/",
     localizedStrings: {closeConfirmation:"${page:chat.close.confirmation}"},
     ${if:agent}${if:canpost}
     predefinedAnswers: ${page:fullPredefinedAnswers},
@@ -39,7 +39,7 @@ var chatParams = {
 }
 //-->
 </script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/chatinit.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/chatinit.js"></script>
 <style type="text/css">
 .tplimage {
 	background: transparent url(${tplroot}/images/wmchat.png) no-repeat scroll 0px 0px;
diff --git a/src/messenger/webim/styles/dialogs/original/templates/chatsimple.tpl b/src/messenger/webim/styles/dialogs/original/templates/chatsimple.tpl
index b2c6e0b4..ef86df4c 100644
--- a/src/messenger/webim/styles/dialogs/original/templates/chatsimple.tpl
+++ b/src/messenger/webim/styles/dialogs/original/templates/chatsimple.tpl
@@ -4,7 +4,7 @@
 <title>${msg:chat.window.title.user}</title>
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css">
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/brws.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/brws.js"></script>
 </head>
 
 <body bgcolor="#FFFFFF" style="background-image: url(${tplroot}/images/bg.gif); margin: 0px;" text="#000000" link="#C28400" vlink="#C28400" alink="#C28400">
diff --git a/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl
index 0f26dfa4..044edac7 100644
--- a/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl
+++ b/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl
@@ -20,8 +20,8 @@
 .isubmit { background-position:0px -39px; width: 40px; height: 35px; }
 .isubmitrest { background-position:-31px -39px; width: 10px; height: 35px;}
 </style>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/leavemessage.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/leavemessage.js"></script>
 <script type="text/javascript">
 ${if:groups}
     var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/styles/dialogs/original/templates/survey.tpl b/src/messenger/webim/styles/dialogs/original/templates/survey.tpl
index b1649114..940f349a 100644
--- a/src/messenger/webim/styles/dialogs/original/templates/survey.tpl
+++ b/src/messenger/webim/styles/dialogs/original/templates/survey.tpl
@@ -20,8 +20,8 @@
 .isubmit { background-position:0px -39px; width: 40px; height: 35px; }
 .isubmitrest { background-position:-31px -39px; width: 10px; height: 35px;}
 </style>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/survey.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/survey.js"></script>
 <script type="text/javascript">
 ${if:groups}
     var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/styles/dialogs/silver/templates/chat.tpl b/src/messenger/webim/styles/dialogs/silver/templates/chat.tpl
index d9b2bf0d..9de06bcf 100644
--- a/src/messenger/webim/styles/dialogs/silver/templates/chat.tpl
+++ b/src/messenger/webim/styles/dialogs/silver/templates/chat.tpl
@@ -6,18 +6,18 @@
 	<link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon" />
 	<link rel="stylesheet" type="text/css" href="${tplroot}/chat.css" media="all" />
         ${page:additional_css}
-	<script type="text/javascript" src="${webimroot}/js/${jsver}/common.js"></script>
+	<script type="text/javascript" src="${webimroot}/js/compiled/common.js"></script>
 	<script type="text/javascript" src="${webimroot}/js/libs/LAB.js"></script>
         <script type="text/javascript" src="${webimroot}/js/libs/json2.js"></script>
 	<script type="text/javascript" src="${webimroot}/js/libs/handlebars.js"></script>
-	<script type="text/javascript" src="${webimroot}/js/${jsver}/handlebars_helpers.js"></script>
+	<script type="text/javascript" src="${webimroot}/js/compiled/handlebars_helpers.js"></script>
 	<script type="text/javascript" src="${tplroot}/js/compiled/message.tpl.js"></script>
 	${page:additional_js}
 	<script type="text/javascript">
 		<!--
 		var chatParams = {
 			cssfile: "${tplroot}/chat.css",
-			jsBasePath: "${webimroot}/js/${jsver}/",
+			jsBasePath: "${webimroot}/js/compiled/",
 			localizedStrings: {closeConfirmation:"${page:chat.close.confirmation}"},
 			${if:agent}${if:canpost}
 			predefinedAnswers: ${page:fullPredefinedAnswers},
@@ -80,7 +80,7 @@
 		window.onresize = setTrueHeight;		
 		//-->
 	</script>
-	<script type="text/javascript" src="${webimroot}/js/${jsver}/chatinit.js"></script>
+	<script type="text/javascript" src="${webimroot}/js/compiled/chatinit.js"></script>
 </head>
 <body class="body">
 	<div id="top">
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 @@
 	<title>${msg:leavemessage.title}</title>
 	<link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon"/>
 	<link rel="stylesheet" type="text/css" href="${tplroot}/chat.css" />
-	<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-	<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/leavemessage.js"></script>
+	<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+	<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/leavemessage.js"></script>
 	<script type="text/javascript">
 ${if:groups}
 	    var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl b/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl
index 09aa52ba..2cae2ecf 100644
--- a/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl
+++ b/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl
@@ -4,8 +4,8 @@
 	<title>${msg:presurvey.title}</title>
 	<link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon"/>
 	<link rel="stylesheet" type="text/css" href="${tplroot}/chat.css" />
-	<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-	<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/survey.js"></script>
+	<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+	<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/survey.js"></script>
 	<script type="text/javascript">
 	${if:groups}
 	    var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/styles/dialogs/simplicity/templates/chat.tpl b/src/messenger/webim/styles/dialogs/simplicity/templates/chat.tpl
index 48dcd8a5..e4d293af 100644
--- a/src/messenger/webim/styles/dialogs/simplicity/templates/chat.tpl
+++ b/src/messenger/webim/styles/dialogs/simplicity/templates/chat.tpl
@@ -5,17 +5,17 @@
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css">
 ${page:additional_css}
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/LAB.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/json2.js"></script>
 <script type="text/javascript" language="javascript" src="${webimroot}/js/libs/handlebars.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/handlebars_helpers.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/handlebars_helpers.js"></script>
 <script type="text/javascript" language="javascript" src="${tplroot}/js/compiled/message.tpl.js"></script>
 ${page:additional_js}
 <script type="text/javascript" language="javascript"><!--
 var chatParams = {
     cssfile: "${tplroot}/chat.css",
-    jsBasePath: "${webimroot}/js/${jsver}/",
+    jsBasePath: "${webimroot}/js/compiled/",
     localizedStrings: {closeConfirmation:"${page:chat.close.confirmation}"},
     ${if:agent}${if:canpost}
     predefinedAnswers: ${page:fullPredefinedAnswers},
@@ -39,7 +39,7 @@ var chatParams = {
 }
 //-->
 </script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/chatinit.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/chatinit.js"></script>
 <style type="text/css">
 .isound { background: url(${tplroot}/images/buttons/sound.gif) no-repeat; width: 19px; height: 19px; }
 .inosound { background: url(${tplroot}/images/buttons/nosound.gif) no-repeat; width: 19px; height: 19px; }
diff --git a/src/messenger/webim/styles/dialogs/simplicity/templates/chatsimple.tpl b/src/messenger/webim/styles/dialogs/simplicity/templates/chatsimple.tpl
index 5f22d2b1..cfbe3fe5 100644
--- a/src/messenger/webim/styles/dialogs/simplicity/templates/chatsimple.tpl
+++ b/src/messenger/webim/styles/dialogs/simplicity/templates/chatsimple.tpl
@@ -4,7 +4,7 @@
 <title>${msg:chat.window.title.user}</title>
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css">
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/brws.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/brws.js"></script>
 </head>
 <body style="background:#EFEFEF;">
 <div id="greybg">
diff --git a/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl
index 672a63f4..6d88761b 100644
--- a/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl
+++ b/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl
@@ -4,8 +4,8 @@
 <title>${msg:leavemessage.title}</title>
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon"/>
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css" />
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/leavemessage.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/leavemessage.js"></script>
 <script type="text/javascript">
 ${if:groups}
     var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl b/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl
index db0b3868..ac5db84b 100644
--- a/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl
+++ b/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl
@@ -4,8 +4,8 @@
 <title>${msg:presurvey.title}</title>
 <link rel="shortcut icon" href="${webimroot}/images/favicon.ico" type="image/x-icon"/>
 <link rel="stylesheet" type="text/css" href="${tplroot}/chat.css" />
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/common.js"></script>
-<script type="text/javascript" language="javascript" src="${webimroot}/js/${jsver}/survey.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/common.js"></script>
+<script type="text/javascript" language="javascript" src="${webimroot}/js/compiled/survey.js"></script>
 <script type="text/javascript">
 ${if:groups}
     var groupDescriptions = ${page:group.descriptions};
diff --git a/src/messenger/webim/view/install_index.php b/src/messenger/webim/view/install_index.php
index 347c4df2..65f7fcec 100644
--- a/src/messenger/webim/view/install_index.php
+++ b/src/messenger/webim/view/install_index.php
@@ -21,14 +21,14 @@ if(isset($page) && isset($page['localeLinks'])) {
 $page['title'] = getlocal("install.title");
 $page['fixedwrap'] = true;
 
-function tpl_header() { global $page, $webimroot, $jsver;
+function tpl_header() { global $page, $webimroot;
 	if($page['soundcheck']) {
 ?>
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/common.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/common.js"></script>
 <script type="text/javascript" language="javascript"><!--
 var wroot ="<?php echo $webimroot ?>";
 //--></script>
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/soundcheck.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/soundcheck.js"></script>
 <?php
 	}
 }
diff --git a/src/messenger/webim/view/invite.php b/src/messenger/webim/view/invite.php
index e1c9ed0c..d4697818 100644
--- a/src/messenger/webim/view/invite.php
+++ b/src/messenger/webim/view/invite.php
@@ -17,16 +17,16 @@
 
 $page['title'] = getlocal("invitation.title");
 
-function tpl_header() { global $page, $webimroot, $jsver;
+function tpl_header() { global $page, $webimroot;
 ?>
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/common.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/common.js"></script>
 <script type="text/javascript" language="javascript"><!--
 var updaterOptions = {
 	url:"<?php echo $webimroot ?>/operator/invitationstate.php",wroot:"<?php echo $webimroot ?>",
 	agentservl:"<?php echo $webimroot ?>/operator/agent.php", frequency:<?php echo $page['frequency'] ?>,
 	visitor: "<?php echo $page['visitor'] ?>" };
 //--></script>
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/invite_op.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/invite_op.js"></script>
 <?php
 }
 
diff --git a/src/messenger/webim/view/menu.php b/src/messenger/webim/view/menu.php
index 4d06a426..8e62e877 100644
--- a/src/messenger/webim/view/menu.php
+++ b/src/messenger/webim/view/menu.php
@@ -19,11 +19,11 @@ require_once("inc_menu.php");
 $page['title'] = getlocal("topMenu.admin");
 $page['menuid'] = "main";
 
-function tpl_header() { global $page, $webimroot, $jsver;
+function tpl_header() { global $page, $webimroot;
 	if(isset($page) && isset($page['localeLinks'])) {
 ?>	
 <script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/libs/jquery.min.js"></script>
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/locale.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/locale.js"></script>
 <?php
 	}
 }
diff --git a/src/messenger/webim/view/pending_users.php b/src/messenger/webim/view/pending_users.php
index 45c4a31c..cc799eb6 100644
--- a/src/messenger/webim/view/pending_users.php
+++ b/src/messenger/webim/view/pending_users.php
@@ -20,9 +20,9 @@ $page['title'] = getlocal("clients.title");
 $page['menuid'] = "users";
 
 
-function tpl_header() { global $page, $webimroot, $jsver;
+function tpl_header() { global $page, $webimroot;
 ?>	
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/common.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/common.js"></script>
 <script type="text/javascript" language="javascript"><!--
 var localized = new Array(
     "<?php echo getlocal("pending.table.speak") ?>",
@@ -43,7 +43,7 @@ var updaterOptions = {
 	showonline: <?php echo $page['showonline'] ?>, showvisitors: <?php echo $page['showvisitors'] ?>, novisitors: "<?php echo getlocal("visitors.no_visitors") ?>",
 	trackedservl:"<?php echo $webimroot ?>/operator/tracked.php", inviteservl:"<?php echo $webimroot ?>/operator/invite.php" };
 //--></script>
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/users.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/users.js"></script>
 <?php
 }
 
diff --git a/src/messenger/webim/view/thread_log.php b/src/messenger/webim/view/thread_log.php
index 770adca4..dd841dbb 100644
--- a/src/messenger/webim/view/thread_log.php
+++ b/src/messenger/webim/view/thread_log.php
@@ -17,11 +17,11 @@
 
 $page['title'] = getlocal("thread.chat_log");
 
-function tpl_header() { global $page, $webimroot, $jsver; ?>
-<script type="text/javascript" src="<?php echo($webimroot); ?>/js/<?php echo($jsver); ?>/common.js"></script>
-<script type="text/javascript" src="<?php echo($webimroot); ?>/js/<?php echo($jsver); ?>/handlebars.js"></script>
-<script type="text/javascript" src="<?php echo($webimroot); ?>/js/<?php echo($jsver); ?>/handlebars_helpers.js"></script>
-<script type="text/javascript" src="<?php echo($webimroot); ?>/js/<?php echo($jsver); ?>/messageview.js"></script>
+function tpl_header() { global $page, $webimroot; ?>
+<script type="text/javascript" src="<?php echo($webimroot); ?>/js/compiled/common.js"></script>
+<script type="text/javascript" src="<?php echo($webimroot); ?>/js/compiled/handlebars.js"></script>
+<script type="text/javascript" src="<?php echo($webimroot); ?>/js/compiled/handlebars_helpers.js"></script>
+<script type="text/javascript" src="<?php echo($webimroot); ?>/js/compiled/messageview.js"></script>
 <script type="text/javascript" src="<?php echo($webimroot); ?>/js/templates/compiled/message.tpl.js"></script>
 <script type="text/javascript"><!--
 	EventHelper.register(window, 'onload', function() {
diff --git a/src/messenger/webim/view/updates.php b/src/messenger/webim/view/updates.php
index 6cb0c8a6..5fc3b71c 100644
--- a/src/messenger/webim/view/updates.php
+++ b/src/messenger/webim/view/updates.php
@@ -19,11 +19,11 @@ require_once("inc_menu.php");
 $page['title'] = getlocal("updates.title");
 $page['menuid'] = "updates";
 
-function tpl_header() { global $page, $webimroot, $jsver;
+function tpl_header() { global $page, $webimroot;
 ?>	
 <script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/libs/jquery.min.js"></script>
 <script type="text/javascript" language="javascript" src="http://mibew.org/latestWebim.js"></script>
-<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/<?php echo $jsver ?>/update.js"></script>
+<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/compiled/update.js"></script>
 <?php
 }