Move all JavaScript files from /js/$jsver to /js/compiled

This commit is contained in:
Dmitriy Simushev 2012-11-22 10:28:22 +00:00
parent f085fbc767
commit 1565458c26
44 changed files with 56 additions and 69 deletions

View File

@ -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"/>

View File

@ -20,11 +20,6 @@
*/
$version = '1.6.5';
/**
* Current version of Mibew Messenger's JavaScript
*/
$jsver = "164";
/**
* Current version of database structure
*/

View File

@ -45,8 +45,7 @@ function get_gifimage_size($filename)
function jspath()
{
global $jsver;
return "js/$jsver";
return "js/compiled";
}
function div($a, $b)

View File

@ -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') {

View File

@ -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;

View File

@ -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">

View File

@ -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};

View File

@ -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};

View File

@ -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;

View File

@ -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">

View File

@ -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};

View File

@ -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};

View File

@ -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">

View File

@ -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};

View File

@ -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};

View File

@ -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; }

View File

@ -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">

View File

@ -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};

View File

@ -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};

View File

@ -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
}
}

View File

@ -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
}

View File

@ -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
}
}

View File

@ -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
}

View File

@ -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() {

View File

@ -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
}