Skip to content

Commit

Permalink
Release 2.6.3 (#347)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dirkrombauts committed May 24, 2016
1 parent 53305e4 commit 1d25afe
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
set "picklesVersion=2.6.2"
set "picklesVersion=2.6.3"

cls

Expand Down
4 changes: 2 additions & 2 deletions src/Pickles/Pickles.BaseDhtmlFiles/js/heirarchyBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});

Expand All @@ -88,7 +88,7 @@ function getFoldersWithASubdirectory(folderList) {
}

function folderHasSubdirectory(folder) {
return folder.indexOf('\\') > -1;
return folder.indexOf('\\') > -1 || folder.indexOf('/') > -1;
}


8 changes: 4 additions & 4 deletions src/Pickles/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}

0 comments on commit 1d25afe

Please sign in to comment.