Changeset 12515 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs

Timestamp:

06/25/15 18:21:19 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

@@ -73 +73 @@
         "~/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"
@@ -99 +100 @@
       };
       PluginManager pluginManager = PluginManager.Instance;
-      foreach (var plugin in pluginManager.GetPlugins()) {
+      foreach (var plugin in pluginManager.Plugins) {
         if (File.Exists(string.Format(@"{0}\{1}\{1}.js", PluginManager.PluginsDirectory, plugin.Name))) {
           jsFiles.Add(string.Format("WebApp/plugins/{0}/{0}.js", plugin.Name));