Merge pull request #599 from Orckestra/fix-Edge42

Fix blocking issues in edge 42.
Orckestra · Jun 28, 2018 · 0947337 · 0947337
2 parents 317f3ad + 2618653
commit 0947337
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/Website/Composite/login.inc b/Website/Composite/login.inc
@@ -1,7 +1,7 @@
 <div class="loginpage">
 	<ui:splash id="splash" class="splash">
 		<ui:decks id="decks" flex="false" class="splash-inner">
-			<ui:brandsnippet snippetName="logo" />
+			<ui:brandsnippet snippetname="logo" />
 			<ui:deck id="introdeck"/>
 			<ui:deck id="logindeck">
 				<ui:fields id="loginfields" >
@@ -77,7 +77,7 @@
 			<ui:deck id="shutdowndeck">
 				<p>Shutting down...</p>
 			</ui:deck>
-			<ui:brandsnippet snippetName="company-logo" />
+			<ui:brandsnippet snippetname="company-logo" />
 		</ui:decks>
 	</ui:splash>
 </div>
diff --git a/Website/Composite/scripts/source/top/ui/bindings/Binding.js b/Website/Composite/scripts/source/top/ui/bindings/Binding.js
@@ -941,8 +941,7 @@ Binding.prototype.subTreeFromString = function ( markup ) {
  */
 Binding.prototype.getProperty = function ( attname ) {
 
-	// MS Edge 42 supports only lowercased attributes. It does not return attribute value for attribute name with capital letters. 
-	var value = this.bindingElement.getAttribute ( Client.isEdge ? attname.toLowerCase() : attname );
+	var value = this.bindingElement.getAttribute ( attname.toLowerCase() );
 
 	if ( value ) {
 		value = Types.castFromString ( value );
@@ -959,7 +958,7 @@ Binding.prototype.getProperty = function ( attname ) {
  * @param {string} attname The name of the attribute
  * @param {object} value The attribute value.
  */
-Binding.prototype.setProperty = function ( prop, value ) {
+Binding.prototype.setProperty = function (attname, value ) {
 
 	if ( value != null ) {
 
@@ -971,20 +970,20 @@ Binding.prototype.setProperty = function ( prop, value ) {
 		 * This will prevent recursive calls to methods which in turn
 		 * modifies the properties of the binding.
 		 */
-		if ( String ( this.bindingElement.getAttribute ( Client.isEdge ? prop.toLowerCase() : prop )) != value ) {
+		if ( String ( this.bindingElement.getAttribute ( attname.toLowerCase() )) != value ) {
 
-			this.bindingElement.setAttribute ( Client.isEdge ? prop.toLowerCase() : prop, value );
+			this.bindingElement.setAttribute ( attname.toLowerCase(), value );
 			if ( this.isAttached == true ) {
 
 				/*
 				 * Handle persistance.
 				 */
 				if ( Persistance.isEnabled && value != null ) {
-					if ( this._persist != null && this._persist [ prop ]) {
-						this._persist [ prop ] = value;
+					if ( this._persist != null && this._persist [ attname ]) {
+						this._persist [ attname ] = value;
 						Persistance.setPersistedProperty (
 							this.bindingElement.id,
-							prop,
+							attname,
 							value
 						);
 					}
@@ -993,24 +992,24 @@ Binding.prototype.setProperty = function ( prop, value ) {
 				/*
 				 * Handle "setters" (methods invoked when setting the property).
 				 */
-				var method = this.propertyMethodMap [ prop ];
+				var method = this.propertyMethodMap [ attname ];
 				if ( method ) {
-					method.call ( this, this.getProperty ( prop ));
+					method.call ( this, this.getProperty ( attname ));
 				}
 			}
 		}
 	} else {
-		this.deleteProperty ( prop );
+		this.deleteProperty ( attname );
 	}
 }
 
 /**
  * Remove bound element attribute.
  * @param {string} prop The name of the attribute
  */
-Binding.prototype.deleteProperty = function ( prop ) {
+Binding.prototype.deleteProperty = function ( attname ) {
 
-	this.bindingElement.removeAttribute ( Client.isEdge ? prop.toLowerCase() : prop );
+	this.bindingElement.removeAttribute ( attname.toLowerCase() );
 }
 
 /**

diff --git a/Website/Composite/scripts/source/top/ui/bindings/branding/BrandSnippetBinding.js b/Website/Composite/scripts/source/top/ui/bindings/branding/BrandSnippetBinding.js
@@ -91,15 +91,15 @@ BrandSnippetBinding.prototype.onBindingAttach = function () {
  */
 BrandSnippetBinding.prototype.getSnippetBrandedUrl = function () {
 
-	return BrandSnippetBinding.SHIPPETBRANDED_URL.replace("{0}", this.getProperty("snippetName"));
+	return BrandSnippetBinding.SHIPPETBRANDED_URL.replace("{0}", this.getProperty("snippetname"));
 }
 
 /**
  * @return {string}
  */
 BrandSnippetBinding.prototype.getSnippetUrl = function () {
 
-	return BrandSnippetBinding.SHIPPET_URL.replace("{0}", this.getProperty("snippetName"));
+	return BrandSnippetBinding.SHIPPET_URL.replace("{0}", this.getProperty("snippetname"));
 }
 
 /**

diff --git a/Website/Composite/scripts/source/top/ui/bindings/editors/visualeditor/VisualEditorBinding.js b/Website/Composite/scripts/source/top/ui/bindings/editors/visualeditor/VisualEditorBinding.js
@@ -328,7 +328,7 @@ VisualEditorBinding.prototype.handleBroadcast = function ( broadcast, arg ) {
 
 	VisualEditorBinding.superclass.handleBroadcast.call ( this, broadcast, arg );
 
-	var windowBinding = this.getContentWindow ().bindingMap.tinywindow;
+	var windowBinding = this.getContentWindow().bindingMap.tinywindow;
 	var contentWindow = windowBinding.getContentWindow ();
 
 	switch ( broadcast ) {