提交 483edb73 编写于 作者: U unknown

修复会议室没有设置的设备的时候,列式会议室可能出错的问题

上级 606dbb0f
...@@ -568,7 +568,7 @@ MWF.xApplication.Meeting.RoomTooltip = new Class({ ...@@ -568,7 +568,7 @@ MWF.xApplication.Meeting.RoomTooltip = new Class({
var titleStyle = "font-size:14px;color:#333"; var titleStyle = "font-size:14px;color:#333";
var valueStyle = "font-size:14px;color:#666;padding-right:20px"; var valueStyle = "font-size:14px;color:#666;padding-right:20px";
var device = []; var device = [];
data.device.split("#").each( function( d ){ ( data.device || "" ).split("#").each( function( d ){
device.push( lp[d] ); device.push( lp[d] );
}.bind(this)); }.bind(this));
...@@ -1060,7 +1060,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({ ...@@ -1060,7 +1060,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({
var iconsNode = new Element("div", {"styles": this.css.roomTitleIconsNode}).inject(inforNode); var iconsNode = new Element("div", {"styles": this.css.roomTitleIconsNode}).inject(inforNode);
var deviceList = room.device.split("#"); var deviceList = ( room.device || "" ).split("#");
deviceList.each(function(name){ deviceList.each(function(name){
if( name ){ if( name ){
var node = new Element("div", {"styles": this.css.roomTitleIconNode, "title": this.lp.device[name]}).inject(iconsNode); var node = new Element("div", {"styles": this.css.roomTitleIconNode, "title": this.lp.device[name]}).inject(iconsNode);
......
...@@ -485,7 +485,7 @@ MWF.xApplication.Meeting.RoomView.Room = new Class({ ...@@ -485,7 +485,7 @@ MWF.xApplication.Meeting.RoomView.Room = new Class({
"styles": this.css.roomItemTitleIconsNode "styles": this.css.roomItemTitleIconsNode
}).inject(this.middleNode); }).inject(this.middleNode);
var deviceList = this.data.device.split("#"); var deviceList = ( this.data.device || "" ).split("#");
deviceList.each(function(name){ deviceList.each(function(name){
var node = new Element("div", {"styles": this.css.roomItemIconNode, "title": this.app.lp.device[name]}).inject(this.iconsNode); var node = new Element("div", {"styles": this.css.roomItemIconNode, "title": this.app.lp.device[name]}).inject(this.iconsNode);
node.setStyle("background-image", "url(../x_component_Meeting/$RoomView/default/icon/device/"+ name + ( this.enable ? "" : "_disable" ) +".png)"); node.setStyle("background-image", "url(../x_component_Meeting/$RoomView/default/icon/device/"+ name + ( this.enable ? "" : "_disable" ) +".png)");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册