From 1d25afe4e8a2b03e34be17f657f60817d9b8b1c6 Mon Sep 17 00:00:00 2001
From: Dirk Rombauts <dirkrombauts@users.noreply.github.com>
Date: Tue, 24 May 2016 14:05:30 +0100
Subject: [PATCH] Release 2.6.3 (#347)

* Enhancement to support Unix path! (#344)

I'm not sure you already got a try or a feedback about it but actually pickles run relatively well under Linux with mono which is interesting when like me you can't get a windows machine.

However without this little change we can't get the folder structure display correctly.

Could you integrate this modification?

Thanks

* Version Bump

* Update change log
---
 CHANGELOG.md                                              | 7 +++++++
 build.bat                                                 | 2 +-
 src/Pickles/Pickles.BaseDhtmlFiles/js/heirarchyBuilder.js | 4 ++--
 src/Pickles/VersionInfo.cs                                | 8 ++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ac56e826..d1888b88e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,13 @@ Features in Experimental are subject to change and removal without being conside
 
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
+## [2.6.3] - 2016-05-24
+
+### Fixed
+
+- Fix path handling for Unix and Mac ([344](https://github.com/picklesdoc/pickles/issues/344)) (by [@jboffel](https://github.com/jboffel)).
+
+
 ## [2.6.2] - 2016-05-11
 
 ### Fixed
diff --git a/build.bat b/build.bat
index 66d812577..e7e0f854a 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.6.2"
+set "picklesVersion=2.6.3"
 
 cls
 
diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/js/heirarchyBuilder.js b/src/Pickles/Pickles.BaseDhtmlFiles/js/heirarchyBuilder.js
index 58c599093..046507a01 100644
--- a/src/Pickles/Pickles.BaseDhtmlFiles/js/heirarchyBuilder.js
+++ b/src/Pickles/Pickles.BaseDhtmlFiles/js/heirarchyBuilder.js
@@ -68,7 +68,7 @@ function getElementInDirectoryList(list, dirName) {
 };
 
 function splitDirectoryPathIntoArrayOfFormattedFolders(path) {
-    var paths = $.map(path.split('\\'), function (directory) {
+    var paths = $.map(path.split(/[\\/]+/), function (directory) {
         return directory;
     });
 
@@ -88,7 +88,7 @@ function getFoldersWithASubdirectory(folderList) {
 }
 
 function folderHasSubdirectory(folder) {
-    return folder.indexOf('\\') > -1;
+    return folder.indexOf('\\') > -1 || folder.indexOf('/') > -1;
 }
 
 
diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs
index 18779fcf5..75a810e70 100644
--- a/src/Pickles/VersionInfo.cs
+++ b/src/Pickles/VersionInfo.cs
@@ -8,11 +8,11 @@
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("2.6.2")]
-[assembly: AssemblyFileVersionAttribute("2.6.2")]
+[assembly: AssemblyVersionAttribute("2.6.3")]
+[assembly: AssemblyFileVersionAttribute("2.6.3")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.6.2";
-        internal const string InformationalVersion = "2.6.2";
+        internal const string Version = "2.6.3";
+        internal const string InformationalVersion = "2.6.3";
     }
 }