Attachment 7760 Details for Bug 41625 – patch

[patch] patch

41625.patch (text/plain), 2.75 KB, created by Florian Best on 2016-06-21 12:39:40 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-06-21 12:39:40 CEST

Size: 2.75 KB

patch

obsolete

>diff --git a/ucs-school-umc-computerroom/umc/js/computerroom/ScreenshotView.js b/ucs-school-umc-computerroom/umc/js/computerroom/ScreenshotView.js
>index edf4e72..2a0c030 100644
>--- a/ucs-school-umc-computerroom/umc/js/computerroom/ScreenshotView.js
>+++ b/ucs-school-umc-computerroom/umc/js/computerroom/ScreenshotView.js
>@@ -35,6 +35,7 @@ define([
> 	"dojo/aspect",
> 	"dojo/dom",
> 	"dojo/dom-geometry",
>+	"dojox/html/entities",
> 	"dijit/layout/ContentPane",
> 	"dijit/_Contained",
> 	"dijit/Tooltip",
>@@ -45,7 +46,7 @@ define([
> 	"umc/widgets/Page",
> 	"umc/widgets/StandbyMixin",
> 	"umc/i18n!umc/modules/computerroom"
>-], function(declare, lang, array, aspect, dom, geometry, ContentPane, _Contained, Tooltip,
>+], function(declare, lang, array, aspect, dom, geometry, entities, ContentPane, _Contained, Tooltip,
>             /*TitlePane,*/ ComboBox, ContainerWidget, Button, Page, StandbyMixin, _) {
> 
> 	// README: This is an alternative view
>@@ -190,9 +191,10 @@ define([
> 			this.inherited( arguments );
> 
> 			lang.mixin( this, {
>-				content: lang.replace( '<em style="font-style: normal; font-size: 80%; padding: 4px; border: 1px solid #000; color: #000; background: #fff; display: block;position: absolute; top: 14px; left: 0px;" id="em-{computer}"></em><img style="width: 100%;" id="img-{computer}"></img>', {
>-					computer: this.computer,
>-					width: this.defaultSize
>+				content: lang.replace( '<em style="font-style: normal; font-size: 80%; padding: 4px; border: 1px solid #000; color: #000; background: #fff; display: block;position: absolute; top: 14px; left: 0px;" id="em-{computer}"></em><img style="width: 100%;" id="img-{computer}" alt="{alternative}"></img>', {
>+					computer: entities.encode(this.computer),
>+					width: this.defaultSize,
>+					alternative: entities.encode(_('Please be patient while the connection establishes.'))
> 				} )
> 			} );
> 			this.startup();
>@@ -200,7 +202,10 @@ define([
> 			// use dijit.Tooltip here to not hide screenshot tooltips if set up in user preferences
> 			var tooltip = new Tooltip({
> 				'class': 'umcTooltip',
>-				label: lang.replace( '<div style="display: table-cell; vertical-align: middle; width: 440px;height: 400px;"><img id="screenshotTooltip-{0}" src="" style="width: 430px; display: block; margin-left: auto; margin-right: auto;"/></div>', [ this.computer ] ),
>+				label: lang.replace( '<div style="display: table-cell; vertical-align: middle; width: 440px;height: 400px;"><img alt="{1}" id="screenshotTooltip-{0}" src="" style="width: 430px; display: block; margin-left: auto; margin-right: auto;"/></div>', [
>+					entities.encode(this.computer),
>+					entities.encode(_('connecting...'))
>+				]),
> 				connectId: [ this.domNode ],
> 				onShow: lang.hitch( this, function() {
> 					var image = dom.byId( 'screenshotTooltip-' + this.computer );

Actions: View | Diff

Attachments on bug 41625: 7758 | 7760