Releasing 1.1.3

Author: technicalguru

js/utils.js

@@ -69,3 +69,10 @@ WebAppUtils.validateFields = function(path) {
 
 	return rc;
 };
+
+WebAppUtils.encodeHtmlEntities = function(s) {
+	var rc = s.replace(/[\u00A0-\u9999<>\&]/g, function(i) {
+	   return '&#'+i.charCodeAt(0)+';';
+	});
+	return rc;
+};

js/webapp.js

@@ -227,7 +227,7 @@ class WebAppModal {
 	constructor(id) {
 		this.id  = id;
 		jQuery('#'+id).remove();
-		jQuery('<div id="'+this.id+'" class="modal" tabindex="-1"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title"></h5><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><div class="modal-body"></div><div class="modal-footer"><button type="button" class="btn btn-secondary close-button" data-dismiss="modal">'+webApp.i18n('close')+'</button></div></div></div></div>').appendTo('body');
+		jQuery('<div id="'+this.id+'" class="modal fade" tabindex="-1"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title"></h5><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><div class="modal-body"></div><div class="modal-footer"><button type="button" class="btn btn-secondary close-button" data-dismiss="modal">'+webApp.i18n('close')+'</button></div></div></div></div>').appendTo('body');
 		this.dom = jQuery('#'+id);
 	}
 

src/WebApp/Page.php

@@ -277,5 +277,9 @@ public function getJavascript() {
 	protected function dao($name) {
 		return $this->app->dao($name);
 	}
+
+	protected function svc($name) {
+		return $this->app->svc($name);
+	}
 }
 

src/WebApp/Renderer.php

@@ -171,14 +171,19 @@ public function setAria($key, $value) {
 	}
 
 	protected function renderStartTag($tagName, $closeTag = FALSE) {
-		$rc = '<'.$tagName;
+		$attributes = $this->computeFinalAttributes();
+		return \TgUtils\Html::renderStartTag($tagName, $attributes, $closeTag);
+	}
+
+	public function computeFinalAttributes() {
+		$rc = array();
 
-		$rc .= ' id="'.htmlspecialchars($this->component->getId()).'"';
+		$rc['id'] = $this->component->getId();
 
-		// Render classes and styles first
+		// classes
 		$classes = $this->getAttribute('class', TRUE);
 		if (($classes != NULL) && (count($classes) > 0)) {
-			$rc .= ' class="'.htmlspecialchars(trim(implode(' ', $classes))).'"';
+			$rc['class'] =  $classes;
 		}
 
 		$styles = $this->getStyles(TRUE);
@@ -187,26 +192,19 @@ protected function renderStartTag($tagName, $closeTag = FALSE) {
 			foreach ($styles AS $name => $value) {
 				$style .= ' '.$name.':'.$value.';';
 			}
-			$rc .= ' style="'.htmlspecialchars(trim($style)).'"';
+			$rc['style'] = trim($style);
 		}
 
 		$attributes = $this->getAttributes(TRUE);
-		unset($attributes['class']);
+		unset($attributes['class'], $attributes['style'], $attributes['id']);
 		foreach ($attributes AS $name => $value) {
-			if (is_array($value)) $value = implode(' ', $value);
-			if (is_numeric($value) || is_string($value)) {
-				$rc .= ' '.$name.'="'.htmlspecialchars($value).'"';
-			}
+			$rc[$name] = $value;
 		}
-
-		if ($closeTag) $rc .= '/';
-		$rc .= '>';
 		return $rc;
 	}
 
 	protected function renderEndTag($tagName) {
-		$rc = '</'.$tagName.'>';
-		return $rc;
+		return \TgUtils\Html::renderEndTag($tagName);
 	}
 
 	public function getParentFor($componentName) {