diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-10 23:25:56 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-10 23:25:56 -0500 |
| commit | e0636b4925d7a15740201f96855d05dfca97d9ad (patch) | |
| tree | 68a2289c98d948a720d20b7787690dfbd3daf30d | |
| parent | 5ed013855f8060590e4190e4998eba3cb7a31b10 (diff) | |
update packaging
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 788825a7b..90d765920 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -354,6 +354,9 @@ namespace MediaBrowser.WebDashboard.Api DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "meteor"); DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "st"); DeleteFoldersByName(Path.Combine(bowerPath, "Swiper"), "src"); + DeleteFoldersByName(Path.Combine(bowerPath, "material-design-lite"), "src"); + DeleteFoldersByName(Path.Combine(bowerPath, "material-design-lite"), "utils"); + _fileSystem.DeleteFile(Path.Combine(bowerPath, "material-design-lite", "gulpfile.babel.js")); _fileSystem.DeleteDirectory(Path.Combine(bowerPath, "marked"), true); _fileSystem.DeleteDirectory(Path.Combine(bowerPath, "marked-element"), true); diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index c3db09457..9c698440e 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -436,14 +436,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new List<string>(); - if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) - { - files.Add("bower_components/requirejs/require.js"); - } - else - { - files.Add("bower_components" + version + "/requirejs/require.js"); - } + files.Add("bower_components/requirejs/require.js"); files.Add("scripts/site.js" + versionString); |