diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-12-21 12:50:25 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-12-21 12:50:25 -0500 |
| commit | 887c09e7375dc07c7cf76335f6d291efce982415 (patch) | |
| tree | 42c7e21ca29471d9b7f8b2c9f8b0fb94c08f9105 /MediaBrowser.WebDashboard | |
| parent | 7dffc197da7fd95eaec750f7a398c18fa2291dc7 (diff) | |
| parent | 83a2823c17b17d47338e1705e85acf18a5e4af5d (diff) | |
Merge pull request #1346 from MediaBrowser/master
merge from master
Diffstat (limited to 'MediaBrowser.WebDashboard')
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 4bb2f583eb..1065f91307 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -434,11 +434,18 @@ namespace MediaBrowser.WebDashboard.Api var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + version : string.Empty; - var files = new List<string> + var files = new List<string>(); + + if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) { - "bower_components/requirejs/require.js" + versionString, - "scripts/site.js" + versionString - }; + files.Add("bower_components/requirejs/require.js"); + } + else + { + files.Add("bower_components" + version + "/requirejs/require.js"); + } + + files.Add("scripts/site.js" + versionString); if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) { |