Fixed F.map() in Windows (a problem with packages).

petersirka · petersirka · commit 1ce7a466a4a5 · 2016-06-29T08:49:45.000+02:00
diff --git a/index.js b/index.js
@@ -1763,13 +1763,13 @@ Framework.prototype.map = function(url, filename, filter) {
 	// package
 	if (c === '@') {
 		if (framework.isWindows)
-			filename = framework_utils.combine(framework.config['directory-temp'], filename.substring(1));
+			filename = framework_utils.combine(framework.config['directory-temp'], prepare_package(filename.substring(1)));
 		else
 			filename = self.path.package(filename.substring(1));
 		isPackage = true;
 	} else if (c === '=') {
 		if (framework.isWindows)
-			filename = framework_utils.combine(framework.config['directory-themes'], filename.substring(1));
+			filename = framework_utils.combine(framework.config['directory-themes'], prepare_package(filename.substring(1)));
 		else
 			filename = self.path.themes(filename.substring(1));
 		isPackage = true;
@@ -14811,6 +14811,17 @@ function prepare_error(e) {
 	return ' :: ' + e.toString();
 }
 
+function prepare_package(name) {
+	var index = name.indexOf('/');
+
+	if (index === -1)
+		return name + '.package';
+
+	var filename = name.substring(index + 1);
+	name = name.substring(0, index);
+	return name + '.package' + (filename ? '/' + filename : '');
+}
+
 function prepare_filename(name) {
 
 	if (name[0] === '@') {
