Changeset 12931 for branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/Configs

Timestamp:

09/02/15 13:16:18 (9 years ago)

Author:

gkronber

Message:

#2434 merged r12878:12927 from trunk to branch (hive changes)

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp/3.3 (modified) (1 prop)
• HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs (modified) (3 diffs)

branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3

@@ -1 +1 @@
 Bin
+HeuristicLab.Services.WebApp-3.3.csproj.user

@@ -1 +1 @@
 Bin
+HeuristicLab.Services.WebApp-3.3.csproj.user

branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

@@ -59 +59 @@
         // bootstrap
         "~/WebApp/libs/bootstrap/js/bootstrap.min.js",
-        // crypto js
+        // cryptojs
         "~/WebApp/libs/cryptojs/aes.js",
         // angular js
@@ -77 +77 @@
         "~/WebApp/libs/angularjs/loading-bar/loading-bar.js",
         "~/WebApp/libs/angularjs/ocLazyLoad/ocLazyLoad.min.js",
+        "~/WebApp/libs/angularjs/fittext/ng-FitText.js",
         // smoothScroll
         "~/WebApp/libs/smoothScroll/smoothScroll.js"
@@ -105 +106 @@
       PluginManager pluginManager = PluginManager.Instance;
       foreach (var plugin in pluginManager.Plugins) {
-        if (File.Exists(string.Format(@"{0}\{1}\{1}.js", PluginManager.PluginsDirectory, plugin.Name))) {
+        var path = Path.Combine(PluginManager.PluginsDirectory, plugin.Name, string.Concat(plugin.Name, ".js"));
+        if (File.Exists(path)) {
           jsFiles.Add(string.Format("WebApp/plugins/{0}/{0}.js", plugin.Name));
         }

@@ -1 +1 @@
 Bin
+HeuristicLab.Services.WebApp-3.3.csproj.user