diff --git a/o2web/source/x_component_Meeting/Common.js b/o2web/source/x_component_Meeting/Common.js index 33e9d3f254ee9a67aeb6419878065e2cff909b4e..d64ca4d3e68edbddd3f08a46634711b22a9bca94 100644 --- a/o2web/source/x_component_Meeting/Common.js +++ b/o2web/source/x_component_Meeting/Common.js @@ -1200,7 +1200,7 @@ MWF.xApplication.Meeting.MeetingForm = new Class({ new Element("a", { style: "font-size:14px;", href: this.data.roomLink, - text: this.data.roomLink, + text: this.lp.openMeetingUrl, target: "_blank" }).inject( node ); } @@ -1209,17 +1209,17 @@ MWF.xApplication.Meeting.MeetingForm = new Class({ node = this.formTableArea.getElement("[item='roomId']"); node.empty(); new Element("span", { text: this.data.roomId, name: "roomId" }).inject( node ); - this.app.isCopyEnable().then(function(flag){ - if( flag ){ - new Element("div", { - "text": this.lp.copy, - "styles": this.app.css.inputDenyButton, - "events": { - "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this) - } - }).inject( node ); - } - }.bind(this)) + // this.app.isCopyEnable().then(function(flag){ + // if( flag ){ + // new Element("div", { + // "text": this.lp.copy, + // "styles": this.app.css.inputDenyButton, + // "events": { + // "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this) + // } + // }).inject( node ); + // } + // }.bind(this)) } }, reloadinviteDelPerson: function(){ @@ -1980,26 +1980,26 @@ MWF.xApplication.Meeting.MeetingTooltip = new Class({ new Element("a", { style: "font-size:13px;", href: this.data.roomLink, - text: this.data.roomLink, + text: this.lp.openMeetingUrl, target: "_blank" }).inject( node ); } - if( this.data.roomId ){ - this.app.isCopyEnable().then(function(flag){ - if( flag ){ - node = this.node.getElement("[item='roomId']"); - node.empty(); - new Element("span", { text: this.data.roomId, name: "roomId" }).inject( node ); - new Element("div", { - "text": this.lp.copy, - "styles": this.app.css.inputDenyButton, - "events": { - "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this) - } - }).inject( node ); - } - }.bind(this)) - } + // if( this.data.roomId ){ + // this.app.isCopyEnable().then(function(flag){ + // if( flag ){ + // node = this.node.getElement("[item='roomId']"); + // node.empty(); + // new Element("span", { text: this.data.roomId, name: "roomId" }).inject( node ); + // new Element("div", { + // "text": this.lp.copy, + // "styles": this.app.css.inputDenyButton, + // "events": { + // "click": function (){ this.app.copyTextToClipboard(this.data.roomId) }.bind(this) + // } + // }).inject( node ); + // } + // }.bind(this)) + //} }, loadRoom: function( callback ){ var area = this.node.getElement("[item='meetingRoom']"); diff --git a/o2web/source/x_component_Meeting/Main.js b/o2web/source/x_component_Meeting/Main.js index 01152a63a3d66faae5f1814cd9c8a12a17d29b2d..c40a1ee916ae66adc705c966c2f71bdb603a1f9f 100644 --- a/o2web/source/x_component_Meeting/Main.js +++ b/o2web/source/x_component_Meeting/Main.js @@ -128,7 +128,7 @@ MWF.xApplication.Meeting.Main = new Class({ isCopyEnable: function(){ return Promise.resolve(false); // if( typeOf(this.copyEnable) === "boolean" )return Promise.resolve(this.copyEnable); - // var text = ""; + // var text = " "; // if (navigator.clipboard) { // return navigator.clipboard.writeText(text).then(function() { // this.copyEnable = true; diff --git a/o2web/source/x_component_Meeting/lp/en.js b/o2web/source/x_component_Meeting/lp/en.js index 70ed081b8f96e07da18af7e9fdccd9d759ef7247..1519b12028aff5894e9881ff5135079a7fc0924d 100644 --- a/o2web/source/x_component_Meeting/lp/en.js +++ b/o2web/source/x_component_Meeting/lp/en.js @@ -167,8 +167,9 @@ MWF.xApplication.Meeting.LP = { "meetingMode": "meeting mode", "meetingModeSelectText": ["offline meeting","online meeting"], "meetingModeSelectValue": ["offline","online"], - "meeting Url": "meeting link", - "meeting Number": "meeting number", + "meetingUrl": "meeting link", + "openMeetingUrl": "Open meeting link", + "meetingNumber": "meeting number", "netMeetingAbb": "Net", "yes": "Yes", "no": "No", diff --git a/o2web/source/x_component_Meeting/lp/es.js b/o2web/source/x_component_Meeting/lp/es.js index 90a5e4c2ce00cc90b06e9d1531046b204a9bcbd4..cdbcd17a6b6f44d6c8601bd8590be6c63a0a53f1 100644 --- a/o2web/source/x_component_Meeting/lp/es.js +++ b/o2web/source/x_component_Meeting/lp/es.js @@ -167,8 +167,9 @@ MWF.xApplication.Meeting.LP = { "meetingMode": "metodo de encuentro", "meetingModeSelectText": ["reunión fuera de línea","reunión en línea"], "meetingModeSelectValue": ["desconectado","en línea"], - "meeting Url": "URL de la reunión", - "meeting Number": "número de reunión", + "meetingUrl": "URL de la reunión", + "openMeetingUrl": "Abrir URL de la reunión", + "meetingNumber": "número de reunión", "netMeetingAbb": "neto", "yes": "Sí", "no": "No", diff --git a/o2web/source/x_component_Meeting/lp/zh-cn.js b/o2web/source/x_component_Meeting/lp/zh-cn.js index 41c252ee64ef21c721e7b5e36b32bdddec3c31ed..8ce6b271cd8962e8111a5052e061cecc1a24af45 100644 --- a/o2web/source/x_component_Meeting/lp/zh-cn.js +++ b/o2web/source/x_component_Meeting/lp/zh-cn.js @@ -168,6 +168,7 @@ MWF.xApplication.Meeting.LP = { "meetingModeSelectText": ["线下会议","线上会议"], "meetingModeSelectValue": ["offline","online"], "meetingUrl": "会议链接", + "openMeetingUrl": "打开会议链接", "meetingNumber": "会议号", "netMeetingAbb": "网", "yes": "是",