源码更新提交

This commit is contained in:
iFish 2014-09-02 15:35:51 +08:00
parent 1c21bf6592
commit 41e225ee16
9 changed files with 19 additions and 13 deletions

View File

@ -152,6 +152,9 @@ namespace DeployTools
}, RegexOptions.IgnoreCase);
File.WriteAllText(fileFull, content);
//release tag
content = content.Replace("$BUILD_DATE$", DateTime.Now.ToString("yyyyMMddhhmmss"));
//使用uglify 压缩
var psi = new ProcessStartInfo(System.Configuration.ConfigurationManager.AppSettings["minifyCmdPath"], "\"" + fileFull + "\"")
{
@ -162,6 +165,9 @@ namespace DeployTools
};
var p = Process.Start(psi);
content = p.StandardOutput.ReadToEnd();
File.WriteAllText(fileFull, content);
}

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.14245.1")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

@ -367,8 +367,8 @@ var CFG_MANGER = (function () {
chrome.tabs.onUpdated.addListener(function (tabid, changeinfo, tab) {
if (changeinfo.status == "complete") {
if ((/https?:\/\/dynamic\.12306\.cn\/.*/i.test(tab.url) || /https?:\/\/www\.12306\.cn\/mormhweb\/kyfw\/?.*/i.test(tab.url)) && !checkIfInfobarShown(tab.id)) {
showInfobar(tab.id, "main", false);
if (/https?:\/\/(www|dynamic|kyfw)\.12306\.cn\/otn.*/i.test(tab.url)) {
showInfobar(tab.id, "main", true);
}
}
});
@ -1360,8 +1360,8 @@ window.cbl = function (u, h) {
socket.onopen = function () {
postMessageToPort({ action: "chatRoomConnected" });
if (currentRoom.heartbeat) {
sendHeartBeat = setInterval(sendHeartBeat, currentRoom.heartbeat);
if (currentRoom.heartbeat && !heratBeatTimer) {
heratBeatTimer = setInterval(sendHeartBeat, currentRoom.heartbeat);
};
};
socket.onmessage = function (e) {

View File

@ -42,7 +42,7 @@
#ticket-info .from-station,
#ticket-info .to-station {
display: inline-block;
max-width: 110px;
max-width: 120px;
-ms-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;

View File

@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>12306订票助手</title>
<link rel="stylesheet" type="text/css" href="css/index.css">
<link rel="stylesheet" type="text/css" href="css/index.css?$BUILD_DATE$">
</head>
<body>
<div class="wrap">

File diff suppressed because one or more lines are too long

View File

@ -148,7 +148,7 @@
//更新显示
that.refreshOnlineCount();
});
port.on("sendMessageFailed", function(e, data) {
port.on("sendMessageFailed", function (e, data) {
that.appendMessageItem(roomStateTemplate({ state: "error", stateIcon: "fa-times", msg: "消息发送失败:" + data, exinfo: "" }));
});
@ -217,7 +217,7 @@
}).remove();
var msg = {
color: user.options.chatColor,
text: $.trim(editorObj.text()),
text: $.trim(editorObj.text()).replace(/\u00a0/g, ""),
target: target
}
if (!msg.text)

View File

@ -1 +1 @@
var favorite_names ='@bji|北京|BJP|0@sha|上海|SHH|1@tji|天津|TJP|2@cqi|重庆|CQW|3@csh|长沙|CSQ|4@cch|长春|CCT|5@cdu|成都|CDW|6@fzh|福州|FZS|7@gzh|广州|GZQ|8@gya|贵阳|GIW|9@hht|呼和浩特|HHC|10@heb|哈尔滨|HBB|11@hfe|合肥|HFH|12@hzh|杭州|HZH|13@hko|海口|VUQ|14@jna|济南|JNK|15@kmi|昆明|KMM|16@lsa|拉萨|LSO|17@lzh|兰州|LZJ|18@nni|南宁|NNZ|19@nji|南京|NJH|20@nch|南昌|NCG|21@sya|沈阳|SYT|22@sjz|石家庄|SJP|23@tyu|太原|TYV|24@wlq|乌鲁木齐|WMR|25@wha|武汉|WHN|26@xnx|西宁西|XXO|27@xan|西安|XAY|28@ych|银川|YIJ|29@zzh|郑州|ZZF|30@szh|深圳|SZQ|shenzhen|sz|31@xme|厦门|XMS|xiamen|xm|32';
var favorite_names ='@bji|北京|BJP|0@sha|上海|SHH|1@tji|天津|TJP|2@cqi|重庆|CQW|3@csh|长沙|CSQ|4@cch|长春|CCT|5@cdu|成都|CDW|6@fzh|福州|FZS|7@gzh|广州|GZQ|8@gya|贵阳|GIW|9@hht|呼和浩特|HHC|10@heb|哈尔滨|HBB|11@hfe|合肥|HFH|12@hzh|杭州|HZH|13@hko|海口|VUQ|14@jna|济南|JNK|15@kmi|昆明|KMM|16@lsa|拉萨|LSO|17@lzh|兰州|LZJ|18@nni|南宁|NNZ|19@nji|南京|NJH|20@nch|南昌|NCG|21@sya|沈阳|SYT|22@sjz|石家庄|SJP|23@tyu|太原|TYV|24@wlq|乌鲁木齐|WMR|25@wha|武汉|WHN|26@xnx|西宁西|XXO|27@xan|西安|XAY|28@ych|银川|YIJ|29@zzh|郑州|ZZF|30@szh|深圳|SZQ|shenzhen|sz|31@xme|厦门|XMS|xiamen|xm|32';

File diff suppressed because one or more lines are too long