Merge branch 'master' of github.com:surveyjs/survey-library into bug/…

…8530-page-rendered-several-times
surveyjs · Jul 11, 2024 · 9ef347f · 9ef347f
2 parents e8b8870 + ca8e2a8
commit 9ef347f
Show file tree

Hide file tree

Showing 51 changed files with 1,827 additions and 334 deletions.
diff --git a/build-scripts/survey-jquery-ui/tsconfig.plugins.themes.typing.json b/build-scripts/survey-jquery-ui/tsconfig.plugins.themes.typing.json
diff --git a/build-scripts/survey-jquery-ui/webpack.config.js b/build-scripts/survey-jquery-ui/webpack.config.js
@@ -7,11 +7,6 @@ var packageJson = require("./package.json");
 var path = require("path");
 
 const config = {
-  entry: {
-    survey: path.resolve(__dirname, "../../src/main.scss"),
-    modern: path.resolve(__dirname, "../../src/modern.scss"),
-    defaultV2: path.resolve(__dirname, "../../src/defaultV2-theme/defaultV2.scss")
-  },
   resolve: {
     alias: {
       "react": "preact/compat",

diff --git a/build-scripts/survey-jquery-ui/webpack.themes.config.js b/build-scripts/survey-jquery-ui/webpack.themes.config.js
diff --git a/build-scripts/survey-ui/tsconfig.plugins.themes.typing.json b/build-scripts/survey-ui/tsconfig.plugins.themes.typing.json
diff --git a/build-scripts/survey-ui/webpack.config.js b/build-scripts/survey-ui/webpack.config.js
@@ -7,11 +7,6 @@ var packageJson = require("./package.json");
 var path = require("path");
 
 const config = {
-  entry: {
-    survey: path.resolve(__dirname, "../../src/main.scss"),
-    modern: path.resolve(__dirname, "../../src/modern.scss"),
-    defaultV2: path.resolve(__dirname, "../../src/defaultV2-theme/defaultV2.scss")
-  },
   resolve: {
     alias: {
       "react": "preact/compat",

diff --git a/build-scripts/survey-ui/webpack.themes.config.js b/build-scripts/survey-ui/webpack.themes.config.js
diff --git a/devops-pull-requests-parallel-jobs.yml b/devops-pull-requests-parallel-jobs.yml
@@ -391,9 +391,8 @@ jobs:
 
     - script: |
         npm run build_ui_prod
-      displayName: "Build jquery-ui"
+      displayName: "Build survey-ui"
 
     - script: |
         npm run testcafe:survey-ui:ci
       displayName: "run functional tests"
-
diff --git a/examples/jquery-ui/index.html b/examples/jquery-ui/index.html
@@ -8,9 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <!-- <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/css/bootstrap.min.css"> -->
-    <!-- <link rel="stylesheet" href="../../build/survey-jquery-ui/survey.css" /> -->
-    <!-- <link rel="stylesheet" href="../../build/survey-jquery-ui/modern.css" /> -->
-    <link rel="stylesheet" href="../../build/survey-jquery-ui/defaultV2.css" />
+    <!-- <link rel="stylesheet" href="../../build/survey-core/survey.css" /> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/modern.css" /> -->
+    <link rel="stylesheet" href="../../build/survey-core/defaultV2.css" />
     <script src="../../build/survey-core/survey.core.js"></script>
     <script src="../../build/survey-jquery-ui/survey-jquery-ui.js"></script>
   </head>

diff --git a/examples/survey-ui/index.html b/examples/survey-ui/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Welcome to JQuery</title>
+
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+    <!-- <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/css/bootstrap.min.css"> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/survey.css" /> -->
+    <!-- <link rel="stylesheet" href="../../build/survey-core/modern.css" /> -->
+    <link rel="stylesheet" href="../../build/survey-core/defaultV2.css" />
+    <script src="../../build/survey-core/survey.core.js"></script>
+    <script src="../../build/survey-ui/survey-ui.js"></script>
+  </head>
+
+  <body>
+    <div id="surveyElement"></div>
+    <div id="surveyResultElement"></div>
+    <script src="./index.js"></script>
+  </body>
+</html>