Merge pull request #1208 from AllenBW/hotfix/ensure-webpack-uses-corr…

…ect-noVNC Ensure correct noVNC location is used
ManageIQ · Nov 2, 2017 · f2d4186 · f2d4186
2 parents e976c69 + 3cc0c02
commit f2d4186
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/app/services/consoles.service.js b/client/app/services/consoles.service.js
@@ -80,7 +80,7 @@ export function ConsolesFactory ($window, CollectionsApi, $timeout, $location, E
   }
 
   function openVnc (results) {
-    var url = '/ui/service/vendor/no-vnc/vnc_auto.html' +
+    var url = '/ui/service/vendor/noVNC/vnc_auto.html' +
       '?host=' + $location.host() +
       '&port=' + $location.port() +
       '&path=' + results.url +

diff --git a/config/webpack.dev.js b/config/webpack.dev.js
@@ -160,7 +160,7 @@ module.exports = {
     new CopyWebpackPlugin([
       {from: `${root}/assets`},
       {from: `${root}/gettext`, to: 'gettext'},
-      {from: `${nodeModules}/no-vnc`, to: 'vendor/no-vnc'},
+      {from: `${nodeModules}/noVNC`, to: 'vendor/noVNC'},
       {from: `${nodeModules}/spice-html5-bower`, to: 'vendor/spice-html5-bower'},
 
       // Override images with skin replacements if they exist