Change how we load the "he.js" lib, in core pydio instead of react exports. Rename He to he in code.

cdujeu · cdujeu · commit 52619a159d28 · 2016-09-14T09:12:31.000+02:00
diff --git a/core/src/plugins/core.notifications/class.NotificationLoader.js b/core/src/plugins/core.notifications/class.NotificationLoader.js
@@ -92,7 +92,7 @@ Class.create("NotificationLoader", {
             }
             var elLabel = el.getLabel();
             if(!elLabel) elLabel = "/";
-            var block = '<div class="notif_event_label">'+He.escape(elLabel)+'</div>';
+            var block = '<div class="notif_event_label">'+he.escape(elLabel)+'</div>';
             var detail = '';
             if(el.getMetadata().get('event_repository_label')){
                 detail += '<div class="notif_event_repository">'+ el.getMetadata().get('event_repository_label') + '</div>';
diff --git a/core/src/plugins/editor.soundmanager/class.SMPlayer.js b/core/src/plugins/editor.soundmanager/class.SMPlayer.js
@@ -199,7 +199,7 @@ Class.create("SMPlayer", AbstractEditor, {
 
     open : function($super, ajxpNode){
         this.currentRichPreview = this.getPreview(ajxpNode, true);
-        this.element.down(".smplayer_title").update(He.escape(ajxpNode.getLabel()));
+        this.element.down(".smplayer_title").update(he.escape(ajxpNode.getLabel()));
         this.element.down(".smplayer_preview_element").insert(this.currentRichPreview);
         window.setTimeout(function(){
             try{this.currentRichPreview.down('span.sm2-360btn').click();}catch(e){}
diff --git a/core/src/plugins/gui.ajax/Gruntfile.js b/core/src/plugins/gui.ajax/Gruntfile.js
@@ -39,6 +39,7 @@ var gui_ajax_core = [
     'res/js/vendor/webfx/ajxptree.js',
     'res/js/vendor/chosen/event.simulate.js',
     'res/js/vendor/chosen/chosen.proto.js',
+    'node_modules/he/he.js',
     'res/js/core/model/User.js',
     'res/js/core/http/ResourcesManager.js',
     'res/js/core/model/RemoteNodeProvider.js',
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js
@@ -282,7 +282,7 @@ Class.create("AbstractEditor" , {
 	 */
 	updateTitle : function(title){
 		if(this.filenameSpan) {
-            this.filenameSpan.update(He.escape(title));
+            this.filenameSpan.update(he.escape(title));
         }
 		if(this.fullScreenMode){
 			this.refreshFullScreenTitle();
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpDraggable.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpDraggable.js
@@ -156,7 +156,7 @@ Class.create("AjxpDraggable", Draggable, {
 			var max = Math.min(nodes.length,5);
 			var maxWidth = 0;
 			for(var i=0;i<max;i++){
-				var text = He.escape(nodes[i].getLabel()) + (i<max-1?",<br>":"");
+				var text = he.escape(nodes[i].getLabel()) + (i<max-1?",<br>":"");
 				maxWidth = Math.max(maxWidth, testStringWidth(text));
 				this._clone.insert(text);
 			}
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js
@@ -133,8 +133,8 @@ Class.create("AjxpTabulator", AjxpPane, {
                 label = MessageHash[tabInfo.label] || tabInfo.label;
             }
             var title = MessageHash[tabInfo.title] || label.stripTags();
-            title = He.escape(title);
-            label = He.escape(label);
+            title = he.escape(title);
+            label = he.escape(label);
             var options = {className:'toggleHeader toggleInactive'};
             if(!this.options.tabsTips){ options.title = title; }
             td = new Element('span', options);
@@ -175,7 +175,7 @@ Class.create("AjxpTabulator", AjxpPane, {
         if(label && label.innerHTML !== undefined){
             if(label.down('.filenameSpan')){
                 var cont = label.down('.filenameSpan').innerHTML;
-                cont = He.escape(cont);
+                cont = he.escape(cont);
                 if(cont.length > 25){
                     cont = cont.substr(0,7)+"[...]"+cont.substr(-13);
                     label.down('.filenameSpan').update(cont);
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BackgroundManagerPane.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BackgroundManagerPane.js
@@ -52,7 +52,7 @@ Class.create("BackgroundManagerPane", {
 
     updatePanelMessage : function(message){
         var imgString = '<img src="'+ajxpResourcesFolder+'/images/loadingImage.gif" width="16" align="absmiddle">';
-        this.panel.update(imgString+' '+ He.escape(message));
+        this.panel.update(imgString+' '+ he.escape(message));
         Effect.Appear(this.panel);
     },
 
@@ -61,7 +61,7 @@ Class.create("BackgroundManagerPane", {
 	 * @param errorMessage String
 	 */
 	updatePanelError:function(errorMessage){
-		this.panel.update(He.escape(errorMessage));
+		this.panel.update(he.escape(errorMessage));
 		this.panel.insert(this.makeCloseLink());
 	},
 	/**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Breadcrumb.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Breadcrumb.js
@@ -86,15 +86,15 @@ Class.create("Breadcrumb", AjxpPane, {
                         refresh = '<i class="icon-refresh ajxp-goto-refresh" title="'+MessageHash[149]+'"></i>';
                     }
                     var first = pos == 0 ? ' first-bread':'';
-                    clickPath += "<li><span class='ajxp-goto "+first+"' data-goTo='"+He.escape(pair.key)+"'><em>"+He.escape(pair.value)+"</em></span></li>";
+                    clickPath += "<li><span class='ajxp-goto "+first+"' data-goTo='"+he.escape(pair.key)+"'><em>"+he.escape(pair.value)+"</em></span></li>";
                     if(refresh){
-                        clickPath += "<li><i class='ajxp-goto' data-goTo='"+He.escape(pair.key)+"'>"+refresh+"</i></li>";
+                        clickPath += "<li><i class='ajxp-goto' data-goTo='"+he.escape(pair.key)+"'>"+refresh+"</i></li>";
                     }
                 }else{
                     if(pos == length-1){
                         refresh = '<span class="icon-refresh ajxp-goto-refresh" title="'+MessageHash[149]+'"></span>';
                     }
-                    clickPath += (pair.value != pos == 0 || !this.options['hide_home_icon'] ? chevron : "") + "<span class='ajxp-goto' data-goTo='"+He.escape(pair.key)+"'>"+He.escape(pair.value)+refresh+"</span>";
+                    clickPath += (pair.value != pos == 0 || !this.options['hide_home_icon'] ? chevron : "") + "<span class='ajxp-goto' data-goTo='"+he.escape(pair.key)+"'>"+he.escape(pair.value)+refresh+"</span>";
                 }
                 pos ++;
             }.bind(this));
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.DataModelProperty.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.DataModelProperty.js
@@ -42,7 +42,7 @@ Class.create("DataModelProperty", {
                     element.update(l?l:'');
                     break;
                 case "root_label":
-                    element.update(He.escape(dm.getRootNode().getLabel()));
+                    element.update(he.escape(dm.getRootNode().getLabel()));
                     break;
                 case "metadata":
                     if(options.metadata_sum){
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
@@ -1792,7 +1792,7 @@ Class.create("FilesList", SelectableElements, {
                 var textLabel = new Element("span", {
                     id          :'ajxp_label',
                     className   :'text_label'+fullview
-                }).update(He.escape(metaData.get('text')));
+                }).update(he.escape(metaData.get('text')));
 
                 if(metaData.get('fonticon') && pydio.currentThemeUsesIconFonts){
                     textLabel.insert({top: new Element('span', {className: 'mimefont mdi mdi-' + metaData.get('fonticon')})});
@@ -1939,7 +1939,7 @@ Class.create("FilesList", SelectableElements, {
 		var label = new Element('div', {
 			className:"thumbLabel",
 			title:textNode.stripTags()
-		}).update(He.escape(textNode));
+		}).update(he.escape(textNode));
 		
 		innerSpan.insert({"bottom":img});
 		innerSpan.insert({"bottom":label});
@@ -2035,7 +2035,7 @@ Class.create("FilesList", SelectableElements, {
 		var label = new Element('div', {
 			className:"thumbLabel",
 			title:textNode.stripTags()
-		}).update(He.escape(textNode));
+		}).update(he.escape(textNode));
 
 		innerSpan.insert({"bottom":img});
 		//newRow.insert({"bottom":label});
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js
@@ -286,7 +286,7 @@ Class.create("FoldersTree", AjxpPane, {
 	 * @param newIcon String
 	 */
 	changeNodeLabel: function(nodeId, newLabel, newIcon){	
-		$(nodeId+'-label').update(He.escape(newLabel));
+		$(nodeId+'-label').update(he.escape(newLabel));
 		if(newIcon){
 			var realNode = webFXTreeHandler.all[nodeId];
 			realNode.icon = newIcon;
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FormManager.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FormManager.js
@@ -250,7 +250,7 @@ Class.create("FormManager", {
                     }else{
                         selectedString = (defaultValue == cValue ? ' selected' : '');
                     }
-                    element += '<option value="'+cValue+'"'+selectedString+'>'+He.escape(cLabel)+'</option>';
+                    element += '<option value="'+cValue+'"'+selectedString+'>'+he.escape(cLabel)+'</option>';
                 }
                 element += '</select><span class="select-styler"></span>';
             }else if(type == "image" && param.get("uploadAction")){
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.InfoPanel.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.InfoPanel.js
@@ -251,7 +251,7 @@ Class.create("InfoPanel", AjxpPane, {
         this._currentObservedNode = uniqNode;
         this._currentObservedNode.observeOnce("node_replaced", this.updateHandler);
 
-        this.updateTitle(He.escape(uniqNode.getLabel()));
+        this.updateTitle(he.escape(uniqNode.getLabel()));
 		var isFile = false;
 		if(uniqNode) isFile = uniqNode.isLeaf();
         if(!isFile && uniqNode && uniqNode.isRoot()){
@@ -438,9 +438,9 @@ Class.create("InfoPanel", AjxpPane, {
                 }
 				tAttributes.each(function(attName){
 					if(attName == 'basename' && metadata.get('filename')){
-						this[attName] = He.escape(getBaseName(metadata.get('filename')));
+						this[attName] = he.escape(getBaseName(metadata.get('filename')));
                         if(metadata.get('text')){
-                            this[attName] = He.escape(metadata.get('text'));
+                            this[attName] = he.escape(metadata.get('text'));
                         }
 					} else if(attName == 'compute_image_dimensions'){
 						if(metadata.get('image_width') && metadata.get('image_height')){
@@ -463,7 +463,7 @@ Class.create("InfoPanel", AjxpPane, {
                             var simpleTpl = new Template('<div class="info_panel_multiple_tile"><div class="tile_preview_container"><div class="tile_preview">#{preview}</div></div><div class="tile_label">#{label}</div></div>');
                             multipleNodes.each(function(n){
                                 var p = oThis.getPreviewElement(n, false, false);
-                                var args = {label:He.escape(PathUtils.getBasename(n.getMetadata().get('filename')))};
+                                var args = {label:he.escape(PathUtils.getBasename(n.getMetadata().get('filename')))};
                                 if(Object.isString(p)) args['preview']=p;
                                 else if(Object.isElement(p) && p.outerHTML) args['preview']= p.outerHTML;
                                 s += simpleTpl.evaluate(args);
@@ -494,7 +494,7 @@ Class.create("InfoPanel", AjxpPane, {
 						}
 						this[attName] = url;
 					} else if(metadata.get(attName)){
-						this[attName] = He.escape(metadata.get(attName));
+						this[attName] = he.escape(metadata.get(attName));
 					} else{
 						this[attName] = '';
 					}
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js
@@ -235,7 +235,7 @@ Class.create("LocationBar", {
 		this.realPath = newPath;
 		this.currentLabel = this.realPath;
 		if(getBaseName(newPath) != newNode.getLabel()){
-			this.currentLabel = getRepName(newPath) + '/' + He.escape(newNode.getLabel());
+			this.currentLabel = getRepName(newPath) + '/' + he.escape(newNode.getLabel());
 		}
 		this.label.update(this.currentLabel);
 		this.currentPath.value = this.realPath;
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Modal.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Modal.js
@@ -710,7 +710,7 @@ Class.create("Modal", {
 			this.messageBox.update(this.messageContent);
 			this.messageBox.observe("click", this.closeMessageDiv.bind(this));
 		}
-		message = He.escape(message);
+		message = he.escape(message);
 		message = message.replace(new RegExp("(\\n)", "g"), "<br>");
 		if(messageType == "ERROR"){ this.messageBox.removeClassName('logMessage');  this.messageBox.addClassName('errorMessage');}
 		else { this.messageBox.removeClassName('errorMessage');  this.messageBox.addClassName('logMessage');}
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.MultiDownloader.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.MultiDownloader.js
@@ -57,7 +57,7 @@
 
 		var new_row_button = new Element('a');
 		new_row_button.href= this.downloadUrl + fileName;
-        var display = He.escape(label?label:getBaseName(fileName));
+        var display = he.escape(label?label:getBaseName(fileName));
 		new_row_button.insert('<img src="'+ajxpResourcesFolder+'/images/actions/16/download_manager.png" height="16" width="16" align="absmiddle" border="0"> '+ display);
 
 		new_row_button.multidownloader = this;
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySelect.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySelect.js
@@ -135,11 +135,11 @@ Class.create("RepositorySelect", {
                     return;
                 }
 
-                var label =  repoObject.getHtmlBadge() + '<span class="menu_label">' + He.escape(repoObject.getLabel()) + '</span>';
-                var alt = He.escape(repoObject.getLabel());
+                var label =  repoObject.getHtmlBadge() + '<span class="menu_label">' + he.escape(repoObject.getLabel()) + '</span>';
+                var alt = he.escape(repoObject.getLabel());
                 if(repoObject.getDescription()){
-                    label += '<span class="menu_description">' + He.escape(repoObject.getDescription()) + '</span>';
-                    alt += '-' + He.escape(repoObject.getDescription());
+                    label += '<span class="menu_description">' + he.escape(repoObject.getDescription()) + '</span>';
+                    alt += '-' + he.escape(repoObject.getDescription());
                 }else{
                     alt += (repoObject.getOwner() ? " ("+MessageHash[413]+" " + repoObject.getOwner()+ ")":"");
                 }
@@ -166,7 +166,7 @@ Class.create("RepositorySelect", {
 					actions.push(actionData);
 				}				
 				if(key == repositoryId){
-					if(this.label) this.label.setValue(He.escape(repoObject.getLabel()));
+					if(this.label) this.label.setValue(he.escape(repoObject.getLabel()));
                     if(this.icon) this.icon.src = repoObject.getIcon();
 				}
 			}.bind(this));
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySimpleLabel.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySimpleLabel.js
@@ -69,9 +69,9 @@ Class.create("RepositorySimpleLabel", AjxpPane, {
             if(repositoryList && repositoryList.size()){
                 var repoObject = repositoryList.get(repositoryId);
                 if(repoObject){
-                    this.htmlElement.down("div.repository_title").update(He.escape(repoObject.getLabel()));
+                    this.htmlElement.down("div.repository_title").update(he.escape(repoObject.getLabel()));
                     if(this.options.displayWorkspaceDescription){
-                        this.htmlElement.down("div.repository_description").update(He.escape(repoObject.getDescription()));
+                        this.htmlElement.down("div.repository_description").update(he.escape(repoObject.getDescription()));
                     }
                 }
             }
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/nodejs/export.js b/core/src/plugins/gui.ajax/res/js/vendor/nodejs/export.js
@@ -16,5 +16,4 @@ window.ReactAutoSuggest = require('react-autosuggest');
 window.Clipboard = require('clipboard');
 window.ReactQRCode = require('qrcode.react');
 window.Cronstrue = require("cronstrue");
-window.He = require("he");
 window.injectTapEventPlugin();
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js b/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js
@@ -290,7 +290,7 @@ WebFXTreeAbstractNode.prototype.add = function (node, bNoIdent) {
 
 
 WebFXTreeAbstractNode.prototype.updateLabel = function(label){
-	if($(this.id+'-label')) $(this.id+'-label').update(He.escape(label));
+	if($(this.id+'-label')) $(this.id+'-label').update(he.escape(label));
 };
 
 WebFXTreeAbstractNode.prototype.updateIcon = function(icon, openIcon, overlayIcon, overlayClasses){

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ Class.create("NotificationLoader", {`
`92`	`92`	`}`
`93`	`93`	`var elLabel = el.getLabel();`
`94`	`94`	`if(!elLabel) elLabel = "/";`
`95`		`- var block = '<div class="notif_event_label">'+He.escape(elLabel)+'</div>';`
	`95`	`+ var block = '<div class="notif_event_label">'+he.escape(elLabel)+'</div>';`
`96`	`96`	`var detail = '';`
`97`	`97`	`if(el.getMetadata().get('event_repository_label')){`
`98`	`98`	`detail += '<div class="notif_event_repository">'+ el.getMetadata().get('event_repository_label') + '</div>';`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ Class.create("AbstractEditor" , {`
`282`	`282`	`*/`
`283`	`283`	`updateTitle : function(title){`
`284`	`284`	`if(this.filenameSpan) {`
`285`		`- this.filenameSpan.update(He.escape(title));`
	`285`	`+ this.filenameSpan.update(he.escape(title));`
`286`	`286`	`}`
`287`	`287`	`if(this.fullScreenMode){`
`288`	`288`	`this.refreshFullScreenTitle();`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ Class.create("AjxpDraggable", Draggable, {`
`156`	`156`	`var max = Math.min(nodes.length,5);`
`157`	`157`	`var maxWidth = 0;`
`158`	`158`	`for(var i=0;i<max;i++){`
`159`		`- var text = He.escape(nodes[i].getLabel()) + (i<max-1?",<br>":"");`
	`159`	`+ var text = he.escape(nodes[i].getLabel()) + (i<max-1?",<br>":"");`
`160`	`160`	`maxWidth = Math.max(maxWidth, testStringWidth(text));`
`161`	`161`	`this._clone.insert(text);`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,15 @@ Class.create("Breadcrumb", AjxpPane, {`
`86`	`86`	`refresh = '<i class="icon-refresh ajxp-goto-refresh" title="'+MessageHash[149]+'"></i>';`
`87`	`87`	`}`
`88`	`88`	`var first = pos == 0 ? ' first-bread':'';`
`89`		`- clickPath += "<li><span class='ajxp-goto "+first+"' data-goTo='"+He.escape(pair.key)+"'><em>"+He.escape(pair.value)+"</em></span></li>";`
	`89`	`+ clickPath += "<li><span class='ajxp-goto "+first+"' data-goTo='"+he.escape(pair.key)+"'><em>"+he.escape(pair.value)+"</em></span></li>";`
`90`	`90`	`if(refresh){`
`91`		`- clickPath += "<li><i class='ajxp-goto' data-goTo='"+He.escape(pair.key)+"'>"+refresh+"</i></li>";`
	`91`	`+ clickPath += "<li><i class='ajxp-goto' data-goTo='"+he.escape(pair.key)+"'>"+refresh+"</i></li>";`
`92`	`92`	`}`
`93`	`93`	`}else{`
`94`	`94`	`if(pos == length-1){`
`95`	`95`	`refresh = '<span class="icon-refresh ajxp-goto-refresh" title="'+MessageHash[149]+'"></span>';`
`96`	`96`	`}`
`97`		`- clickPath += (pair.value != pos == 0 \|\| !this.options['hide_home_icon'] ? chevron : "") + "<span class='ajxp-goto' data-goTo='"+He.escape(pair.key)+"'>"+He.escape(pair.value)+refresh+"</span>";`
	`97`	`+ clickPath += (pair.value != pos == 0 \|\| !this.options['hide_home_icon'] ? chevron : "") + "<span class='ajxp-goto' data-goTo='"+he.escape(pair.key)+"'>"+he.escape(pair.value)+refresh+"</span>";`
`98`	`98`	`}`
`99`	`99`	`pos ++;`
`100`	`100`	`}.bind(this));`