mirror of
				https://github.com/node-red/node-red.git
				synced 2025-03-01 10:36:34 +00:00 
			
		
		
		
	Merge branch 'master' into dev
This commit is contained in:
		| @@ -863,6 +863,7 @@ RED.utils = (function() { | ||||
|             obj[key] = value; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     function separateIconPath(icon) { | ||||
|         var result = {module: "", file: ""}; | ||||
|         if (icon) { | ||||
| @@ -870,10 +871,10 @@ RED.utils = (function() { | ||||
|             if (index === 0) { | ||||
|                 icon = icon.substring((RED.settings.apiRootUrl+'icons/').length); | ||||
|             } | ||||
|             index = icon.indexOf('/'); | ||||
|             if (index !== -1) { | ||||
|                 result.module = icon.slice(0, index); | ||||
|                 result.file = icon.slice(index + 1); | ||||
|             var match = /^((?:@[^/]+\/)?[^/]+)\/(.*)$/.exec(icon); | ||||
|             if (match) { | ||||
|                 result.module = match[1]; | ||||
|                 result.file = match[2]; | ||||
|             } else { | ||||
|                 result.file = icon; | ||||
|             } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user