diff --git a/o2web/source/x_component_Attendance/AbnormalExport.js b/o2web/source/x_component_Attendance/AbnormalExport.js index e097bb2d90c154c308da70d0cd0680cc0f17045e..2744aba49fe8f4a74c28ec43204949132c88106f 100644 --- a/o2web/source/x_component_Attendance/AbnormalExport.js +++ b/o2web/source/x_component_Attendance/AbnormalExport.js @@ -43,7 +43,7 @@ MWF.xApplication.Attendance.AbnormalExport = new Class({ }, createYearSelectTd : function( tr ){ var _self = this; - var td = new Element("td", { "styles" : this.css.filterTableTitle, "text" : "年度" }).inject(tr); + var td = new Element("td", { "styles" : this.css.filterTableTitle, "text" : this.app.lp.annuaal }).inject(tr); var td = new Element("td", { "styles" : this.css.filterTableValue }).inject(tr); this.yearString = new MDomItem( td, { "name" : "yearString", diff --git a/o2web/source/x_component_Attendance/lp/zh-cn.js b/o2web/source/x_component_Attendance/lp/zh-cn.js index 2cd83880f1bd9730f13436d24eb0a6135ca1b6c4..5100a95096c438d7bbc4da5e938d51a3e3b5485e 100644 --- a/o2web/source/x_component_Attendance/lp/zh-cn.js +++ b/o2web/source/x_component_Attendance/lp/zh-cn.js @@ -49,7 +49,6 @@ MWF.xApplication.Attendance.LP = { "abNormalDutyCount" : "异常打卡人次", "resultNormal" : "正常打卡次数", "seriousLateTimes": "严重迟到次数", - "leaveEarlyTimes": "早退次数", "absenteeismTimes": "矿工次数", "notSignedCount": "未打卡次数", diff --git a/o2web/source/x_component_Forum/TopNode.js b/o2web/source/x_component_Forum/TopNode.js index cdd314d2ff0ee39c24a94cc67d17d70621251d58..59dabb9851f17d9e37d0bfadc34d51a6d0e8baf2 100644 --- a/o2web/source/x_component_Forum/TopNode.js +++ b/o2web/source/x_component_Forum/TopNode.js @@ -201,7 +201,7 @@ MWF.xApplication.Forum.TopNode = new Class({ //}).inject(this.personNode); this.personTextNode = new Element("div", { "styles": this.css.personTextNode, - "text": MWF.xApplication.Forum.LP.welcomeTitle.replace("{n}", ( this.userName || "").split("@")[0]), + "text": MWF.xApplication.Forum.LP.welcomeTitle.replace("{user}", ( this.userName || "").split("@")[0]), "title" : MWF.xApplication.Forum.LP.seePersonCenter }).inject(this.personNode); this.personNode.addEvent("click", function(){ this.openPerson(this.userName ) }.bind(this)) diff --git a/o2web/source/x_component_ForumDocument/Main.js b/o2web/source/x_component_ForumDocument/Main.js index 9e8dad3f1407da3bcdc543eacda1bbac7111610c..76a4ebfe7657110e7eef2010c28d89454a1e5801 100644 --- a/o2web/source/x_component_ForumDocument/Main.js +++ b/o2web/source/x_component_ForumDocument/Main.js @@ -452,17 +452,17 @@ MWF.xApplication.ForumDocument.Main = new Class({ }, reloadAllParents : function(){ var aid = "Forum"; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } aid = "ForumCategory"+this.sectionData.forumId; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } aid = "ForumSection"+this.sectionData.id; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } }, @@ -1220,6 +1220,7 @@ MWF.xApplication.ForumDocument.Main = new Class({ }.bind(this) }, onGotoItem : function( top ){ + debugger; var t = top - this.content.getTop(); this.contentContainerNode.scrollTo( 0, t ); }.bind(this) diff --git a/o2web/source/x_component_ForumDocument/Vote.js b/o2web/source/x_component_ForumDocument/Vote.js index b23d97cf4195c45c0f8ca9ac536192e2b7e020d6..b9c97d684832d0142594370c159109eb4e007bce 100644 --- a/o2web/source/x_component_ForumDocument/Vote.js +++ b/o2web/source/x_component_ForumDocument/Vote.js @@ -161,6 +161,7 @@ MWF.xApplication.ForumDocument.Vote = new Class({ }, createGroupVoted : function(data, idx){ + var _self = this; var bgColor = this.getRandomColor(); var maxWidth = "800"; var sum = 0; @@ -168,7 +169,7 @@ MWF.xApplication.ForumDocument.Vote = new Class({ var contentUsePicture = false; data.voteOptions.each( function(opt){ sum += parseInt( opt.chooseCount ); - if( opt.optionContentType == this.lp.picture ){ + if( opt.optionContentType == _self.lp.picture ){ contentUsePicture = true; } }); @@ -728,13 +729,13 @@ MWF.xApplication.ForumDocument.Vote = new Class({ var returnStr = seconds + this.lp.second; if(minutes>0) { - returnStr = minutes + this.lp.mintue + returnStr; + returnStr = minutes + this.lp.minute + returnStr; } if(hours>0) { returnStr = hours + this.lp.hour + returnStr; } if(days>0) { - returnStr = days + thi.lp.day + returnStr; + returnStr = days + this.lp.day + returnStr; } return returnStr; }, diff --git a/o2web/source/x_component_ForumPerson/Main.js b/o2web/source/x_component_ForumPerson/Main.js index cd8f0df3e8dcabc38a8974007de131377bab0d16..8686cd933f3ddb52ef0208c6fc8396fca3630303 100644 --- a/o2web/source/x_component_ForumPerson/Main.js +++ b/o2web/source/x_component_ForumPerson/Main.js @@ -123,17 +123,17 @@ MWF.xApplication.ForumPerson.Main = new Class({ reloadAllParents : function( sectionId ){ this.restActions.getSection( sectionId, function( json ){ var aid = "Forum"; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload ){ this.desktop.apps[aid].reload(); } aid = "ForumCategory"+json.data.forumId; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } aid = "ForumSection"+sectionId; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } }.bind(this) ) diff --git a/o2web/source/x_component_ForumSearch/Main.js b/o2web/source/x_component_ForumSearch/Main.js index 27f23d1d4506522fab936e787e06e5bbd0592b0d..c761e91fd1b22d4e796c72af8be6f68412bf3932 100644 --- a/o2web/source/x_component_ForumSearch/Main.js +++ b/o2web/source/x_component_ForumSearch/Main.js @@ -41,17 +41,17 @@ MWF.xApplication.ForumSearch.Main = new Class({ reloadAllParents : function( sectionId ){ this.restActions.getSection( sectionId, function( json ){ var aid = "Forum"; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } aid = "ForumCategory"+json.data.forumId; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } aid = "ForumSection"+sectionId; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } }.bind(this) ) diff --git a/o2web/source/x_component_ForumSection/Main.js b/o2web/source/x_component_ForumSection/Main.js index 76761cec41fcb752ecb68f77d7e519831ce5d8fa..10b6d76f3703ee15a4420160935a368f1dba3f40 100644 --- a/o2web/source/x_component_ForumSection/Main.js +++ b/o2web/source/x_component_ForumSection/Main.js @@ -69,12 +69,12 @@ MWF.xApplication.ForumSection.Main = new Class({ }, reloadAllParents : function(){ var aid = "Forum"; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } aid = "ForumCategory"+this.sectionData.forumId; - if (this.desktop.apps[aid]){ + if (this.desktop.apps[aid] && this.desktop.apps[aid].reload){ this.desktop.apps[aid].reload(); } },