Change src/sass/jquery-ui.js to a scss file

camptocamp · Aug 22, 2019 · 23954b2 · 23954b2
1 parent adfaf5f
commit 23954b2
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 37 deletions.
diff --git a/buildtools/webpack.plugin.js b/buildtools/webpack.plugin.js
@@ -105,7 +105,7 @@ function * mergeSources(opts, entry, resolve, level) {
         }
         const absoluteFile = path.normalize(path.resolve(entryDir, file));
         // fix for windows path
-        let relativeFile = path.relative(opts.baseEntryDir, absoluteFile).replace(/\\/g, '/');
+        let relativeFile = path.relative(process.cwd(), absoluteFile).replace(/\\/g, '/');
 
         if (relativeFile[0] !== '.') {
           relativeFile = `./${relativeFile}`;
@@ -293,23 +293,28 @@ function manageContent(pluginOptions, usedContext, compilation, chunk, resolve,
         }
         try {
           const assetUrl = url.getValue();
-          let assetName = url.getValue().substr(1);
-          let queryString = '';
-          const questionMarkIndex = assetName.indexOf('?');
-          if (questionMarkIndex > 0) {
-            queryString = assetName.substr(questionMarkIndex);
-            assetName = assetName.substr(0, questionMarkIndex);
-          } else {
-            const sharpIndex = assetName.indexOf('#');
-            if (sharpIndex > 0) {
-              queryString = assetName.substr(sharpIndex);
-              assetName = assetName.substr(0, sharpIndex);
+          if (assetUrl[0] == '~') {
+            let assetName = assetUrl.substr(1);
+            let queryString = '';
+            const questionMarkIndex = assetName.indexOf('?');
+            if (questionMarkIndex > 0) {
+              queryString = assetName.substr(questionMarkIndex);
+              assetName = assetName.substr(0, questionMarkIndex);
+            } else {
+              const sharpIndex = assetName.indexOf('#');
+              if (sharpIndex > 0) {
+                queryString = assetName.substr(sharpIndex);
+                assetName = assetName.substr(0, sharpIndex);
+              }
             }
+            promises.push(new Promise(fillDependency(
+              pluginOptions, usedContext, compilation, assetName, assetUrl, queryString, replacements
+            )));
+          } else {
+            promises.push(new Promise(fillDependency(
+              pluginOptions, usedContext, compilation, assetUrl, assetUrl, '', replacements
+            )));
           }
-
-          promises.push(new Promise(fillDependency(
-            pluginOptions, usedContext, compilation, assetName, assetUrl, queryString, replacements
-          )));
         } catch (e) {
           console.error(e.stack || e);
           callback(`SCSS plugin error, ${e}`);

diff --git a/contribs/gmf/src/layertree/timeSliderComponent.js b/contribs/gmf/src/layertree/timeSliderComponent.js
@@ -3,6 +3,7 @@ import ngeoMiscWMSTime from 'ngeo/misc/WMSTime.js';
 import ngeoMiscDebounce from 'ngeo/misc/debounce.js';
 
 import 'jquery-ui/ui/widgets/slider.js';
+import 'ngeo/sass/jquery-ui.scss';
 import 'angular-ui-slider';
 import './timeslider.scss';
 

diff --git a/contribs/gmf/src/query/windowComponent.js b/contribs/gmf/src/query/windowComponent.js
@@ -14,6 +14,7 @@ import olStyleStroke from 'ol/style/Stroke.js';
 import olStyleStyle from 'ol/style/Style.js';
 
 import 'jquery-ui/ui/widgets/resizable.js';
+import 'ngeo/sass/jquery-ui.scss';
 import 'angular-animate';
 import 'angular-touch';
 import 'bootstrap/js/src/collapse.js';

diff --git a/src/message/displaywindowComponent.js b/src/message/displaywindowComponent.js
@@ -3,6 +3,7 @@ import angular from 'angular';
 import 'ngeo/sass/font.scss';
 import 'jquery-ui/ui/widgets/resizable.js';
 import 'jquery-ui/ui/widgets/draggable.js';
+import 'ngeo/sass/jquery-ui.scss';
 import 'angular-sanitize';
 
 

diff --git a/src/message/modalComponent.js b/src/message/modalComponent.js
@@ -1,5 +1,6 @@
 import angular from 'angular';
 import 'jquery-ui/ui/widgets/draggable.js';
+import 'ngeo/sass/jquery-ui.scss';
 import 'bootstrap/js/src/modal.js';
 
 

diff --git a/src/misc/datepickerComponent.js b/src/misc/datepickerComponent.js
@@ -2,7 +2,7 @@ import angular from 'angular';
 import ngeoMiscTime from 'ngeo/misc/Time.js';
 
 import 'angular-ui-date';
-import 'ngeo/sass/jquery-ui.js';
+import 'ngeo/sass/jquery-ui.scss';
 
 // FIXME: import the locales in the applications
 import 'jquery-ui/ui/i18n/datepicker-fr.js';

diff --git a/src/misc/sortableComponent.js b/src/misc/sortableComponent.js
@@ -1,5 +1,6 @@
 import angular from 'angular';
 import 'jquery-ui/ui/widgets/sortable.js';
+import 'ngeo/sass/jquery-ui.scss';
 import 'jquery-ui-touch-punch';
 
 

diff --git a/src/sass/jquery-ui.js b/src/sass/jquery-ui.js
diff --git a/src/sass/jquery-ui.scss b/src/sass/jquery-ui.scss
@@ -0,0 +1,20 @@
+@import "~jquery-ui/themes/base/core.css";
+// @import "~jquery-ui/themes/base/accordion.css";
+// @import "~jquery-ui/themes/base/autocomplete.css";
+// @import "~jquery-ui/themes/base/button.css";
+// @import "~jquery-ui/themes/base/checkboxradio.css";
+// @import "~jquery-ui/themes/base/controlgroup.css";
+@import "~jquery-ui/themes/base/datepicker.css";
+// @import "~jquery-ui/themes/base/dialog.css";
+@import "~jquery-ui/themes/base/draggable.css";
+// @import "~jquery-ui/themes/base/menu.css";
+// @import "~jquery-ui/themes/base/progressbar.css";
+@import "~jquery-ui/themes/base/resizable.css";
+// @import "~jquery-ui/themes/base/selectable.css";
+// @import "~jquery-ui/themes/base/selectmenu.css";
+// @import "~jquery-ui/themes/base/sortable.css";
+@import "~jquery-ui/themes/base/slider.css";
+// @import "~jquery-ui/themes/base/spinner.css";
+// @import "~jquery-ui/themes/base/tabs.css";
+// @import "~jquery-ui/themes/base/tooltip.css";
+@import "~jquery-ui/themes/base/theme.css";