Skip to content

Commit

Permalink
Merge pull request #100 from usmanazizgroupdocs/master
Browse files Browse the repository at this point in the history
Updated for v16.11.0
  • Loading branch information
Usman Aziz committed Nov 24, 2016
2 parents 4e9d663 + 43fb8b7 commit 202c14d
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ public ActionResult LoadFileBrowserTreeData(LoadFileBrowserTreeDataParameters pa
if (!string.IsNullOrEmpty(parameters.Path))
path = Path.Combine(path, parameters.Path);

var request = new FileTreeOptions(path);
var tree = _htmlHandler.LoadFileTree(request);
var request = new FileListOptions(path);
var tree = _htmlHandler.GetFileList(request);

var result = new FileBrowserTreeDataResponse
{
nodes = Utils.ToFileTreeNodes(parameters.Path, tree.FileTree).ToArray(),
count = tree.FileTree.Count
nodes = Utils.ToFileTreeNodes(parameters.Path, tree.Files).ToArray(),
count = tree.Files.Count
};

return ToJsonResult(result);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="GroupDocs.Viewer, Version=16.10.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\groupdocs-viewer-dotnet.16.10.0\lib\GroupDocs.Viewer.dll</HintPath>
<Reference Include="GroupDocs.Viewer, Version=16.11.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\groupdocs-viewer-dotnet.16.11.0\lib\GroupDocs.Viewer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
<package id="groupdocs-viewer-dotnet" version="16.10.0" targetFramework="net45" />
<package id="groupdocs-viewer-dotnet" version="16.11.0" targetFramework="net45" />
<package id="jQuery" version="1.10.2" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
Expand Down
4 changes: 2 additions & 2 deletions Showcases/ASP.NET_MVC_Front_End/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ This Application allows a user to see the Html or Image Representation of a docu

* Visual Studio 2012 or later.
* Any latest browsers (Firefox, Chrome ,IE9 or greater, Safari etc. )
* GroupDocs.Viewer 3.6.0.
* GroupDocs.Viewer 16.11.0.


# Installation

* Visual Studio 2012 or Later.
* Download the code, open it in MS Visual Studio 2012
* Download *GroupDocs.Viewer 3.6.0* Or add from Nuget.
* Download *GroupDocs.Viewer 16.11.0* Or add from Nuget.
* Add the Reference of GroupDocs.Viewer into the project.
* Update the required or missing libraries from Nuget.
* Run the code.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ protected void Page_Load(object sender, EventArgs e)
{
_config = new ViewerConfig
{
StoragePath = _storagePath,
TempPath = _tempPath,
StoragePath = _storagePath,
UseCache = true
};

Expand Down Expand Up @@ -77,9 +76,8 @@ protected void Page_Load(object sender, EventArgs e)
};

if (parameters.Rotate && parameters.Width.HasValue)
{
DocumentInfoOptions documentInfoOptions = new DocumentInfoOptions(guid);
DocumentInfoContainer documentInfoContainer = imageHandler.GetDocumentInfo(documentInfoOptions);
{
DocumentInfoContainer documentInfoContainer = imageHandler.GetDocumentInfo(guid);

int side = parameters.Width.Value;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ protected void Page_Load(object sender, EventArgs e)
{
_config = new ViewerConfig
{
StoragePath = _storagePath,
TempPath = _tempPath,
StoragePath = _storagePath,
UseCache = true
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="GroupDocs.Viewer, Version=16.10.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\groupdocs-viewer-dotnet.16.10.0\lib\GroupDocs.Viewer.dll</HintPath>
<Reference Include="GroupDocs.Viewer, Version=16.11.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\groupdocs-viewer-dotnet.16.11.0\lib\GroupDocs.Viewer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,15 @@ protected void Page_Load(object sender, EventArgs e)

var htmlConfig = new ViewerConfig
{
StoragePath = _storagePath,
TempPath = _tempPath,
StoragePath = _storagePath,
UseCache = true
};

_htmlHandler = new ViewerHtmlHandler(htmlConfig);

var imageConfig = new ViewerConfig
{
StoragePath = _storagePath,
TempPath = _tempPath,
StoragePath = _storagePath,
UseCache = true,
UsePdf = true
};
Expand Down Expand Up @@ -112,12 +110,12 @@ public static FileBrowserTreeDataResponse LoadFileBrowserTreeData(LoadFileBrowse



var tree = _htmlHandler.LoadFileTree(new FileTreeOptions(path));
var treeNodes = tree.FileTree;
var tree = _htmlHandler.GetFileList(new FileListOptions(path));
var treeNodes = tree.Files;
var data = new FileBrowserTreeDataResponse
{
nodes = ToFileTreeNodes(parameters.Path, treeNodes).ToArray(),
count = tree.FileTree.Count
count = tree.Files.Count
};

return data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="groupdocs-viewer-dotnet" version="16.10.0" targetFramework="net40" />
<package id="groupdocs-viewer-dotnet" version="16.11.0" targetFramework="net40" />
</packages>
4 changes: 2 additions & 2 deletions Showcases/ASP.NET_WebForm_Front_End/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ This Application allows a user to see the Html or Image Representation of a docu

* Visual Studio 2012 or later.
* Any latest browsers (Firefox, Chrome ,IE9 or greater, Safari etc. )
* GroupDocs.Viewer 3.6.0.
* GroupDocs.Viewer 16.11.0.


# Installation

* Visual Studio 2012 or Later.
* Download the code, open it in MS Visual Studio 2012
* Download *GroupDocs.Viewer 3.6.0* Or add from Nuget.
* Download *GroupDocs.Viewer 16.11.0* Or add from Nuget.
* Add the Reference of GroupDocs.Viewer into the project.
* Update the required or missing libraries from Nuget.
* Run the code.
Expand Down

0 comments on commit 202c14d

Please sign in to comment.