Merge pull request #6 from mykabam/im-4136

kamberpeka · web-flow · commit 39c1470db6ea · 2024-01-11T14:51:06.000+01:00
Fix(ngFormio) - Fix formio calendar widget translation issue in crs and zh-CN
diff --git a/dist/formio.css b/dist/formio.css
diff --git a/dist/ng-formio.js b/dist/ng-formio.js
diff --git a/dist/ng-formio.js.map b/dist/ng-formio.js.map
diff --git a/dist/ng-formio.min.js b/dist/ng-formio.min.js
diff --git a/dist/ng-formio.min.js.map b/dist/ng-formio.min.js.map
diff --git a/lib/directives/formio.js b/lib/directives/formio.js
@@ -100,7 +100,7 @@ var _default = app.directive('formio', function () {
         if ($scope.src || $scope.form) {
           $scope.initialized = true;
           window.Formio.createForm($scope.element, $scope.src || $scope.form, _.cloneDeep($scope.options)).then(function (formio) {
-            window.languages = window.languages || {
+            window.languages = {
               en: true
             };
             window.setFormioLanguage = function (lang, generics) {
diff --git a/lib/factories/FormioScope.js b/lib/factories/FormioScope.js
@@ -15,7 +15,7 @@ require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.regexp.to-string.js");
 var _formiojs = require("formiojs");
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var app = angular.module('formio');
 var _default = app.factory('FormioScope', function () {
   return {
diff --git a/lib/providers/Formio.js b/lib/providers/Formio.js
@@ -27,6 +27,8 @@ app.config(['$httpProvider', '$injector', function ($httpProvider, $injector) {
   $httpProvider.interceptors.push('formioInterceptor');
 }]);
 var _default = app.provider('Formio', function () {
+  _formiojs.Formio.GlobalFormio.cdn['flatpickr-formio'] = "".concat(window.location.origin, "/vendors/flatpickr");
+
   // Return the provider interface.
   return {
     // Expose Formio configuration functions
diff --git a/lib/providers/formioInterceptor.js b/lib/providers/formioInterceptor.js
@@ -4,13 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es.array.slice.js");
 var app = angular.module('formio');
 var _default = app.factory('formioInterceptor', ['$q', '$rootScope', 'Formio', function ($q, $rootScope, Formio) {
   var Interceptor = {
     /**
      * Update JWT token received from response.
      */
     response: function response(_response) {
+      window.FORMIO_SETTINGS && window.FORMIO_SETTINGS.url && Formio.setBaseUrl(window.FORMIO_SETTINGS.url.slice(0, -1)) && Formio.setProjectUrl(window.FORMIO_SETTINGS.url.slice(0, -1)) && Formio.setApiUrl(window.FORMIO_SETTINGS.url.slice(0, -1));
       var token = _response.headers('x-jwt-token');
       if (_response.status >= 200 && _response.status < 300 && token && token !== '') {
         Formio.setToken(token);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mykabam/ng-formio",
-  "version": "4.16.7",
+  "version": "4.17.0",
   "description": "The form redering engine behind Form.IO.",
   "main": "dist/ng-formio.js",
   "scripts": {
diff --git a/src/directives/formBuilder.js b/src/directives/formBuilder.js
@@ -1,4 +1,5 @@
 import { Formio } from 'formiojs';
+
 export default angular.module('formio').directive('formBuilder', function() {
   return {
     restrict: 'E',
diff --git a/src/directives/formio.js b/src/directives/formio.js
@@ -82,7 +82,7 @@ export default app.directive('formio', function () {
           if ($scope.src || $scope.form) {
             $scope.initialized = true;
             window.Formio.createForm($scope.element, $scope.src || $scope.form, _.cloneDeep($scope.options)).then((formio) => {
-              window.languages = window.languages || { en: true };
+              window.languages = { en: true };
 
               window.setFormioLanguage = function (lang, generics) {
                 // $scope.$parent.$parent.vm.submission.data.currentLanguage = $scope.language;
diff --git a/src/directives/formioDelete.js b/src/directives/formioDelete.js
@@ -1,4 +1,5 @@
 import { Formio } from 'formiojs';
+
 const app = angular.module('formio');
 export default app.directive('formioDelete', function() {
   return {
diff --git a/src/factories/FormioScope.js b/src/factories/FormioScope.js
@@ -1,4 +1,5 @@
 import { Formio } from 'formiojs';
+
 const app = angular.module('formio');
 export default app.factory('FormioScope', function() {
   return {
diff --git a/src/filters/translate.js b/src/filters/translate.js
@@ -1,4 +1,5 @@
 import { Formio } from 'formiojs';
+
 const app = angular.module('formio');
 export default app.filter('formioTranslate', [
   '$filter',
diff --git a/src/providers/Formio.js b/src/providers/Formio.js
@@ -29,7 +29,10 @@ app.config([
   }
 ]);
 
-export default app.provider('Formio', function() {
+export default app.provider('Formio', function () {
+  
+  Formio.GlobalFormio.cdn['flatpickr-formio'] = `${window.location.origin}/vendors/flatpickr`;
+  
   // Return the provider interface.
   return {
 
diff --git a/src/providers/formioInterceptor.js b/src/providers/formioInterceptor.js
@@ -8,7 +8,14 @@ export default app.factory('formioInterceptor', [
       /**
        * Update JWT token received from response.
        */
-      response: function(response) {
+      response: function (response) {
+        
+        window.FORMIO_SETTINGS &&
+        window.FORMIO_SETTINGS.url &&
+        Formio.setBaseUrl(window.FORMIO_SETTINGS.url.slice(0, -1)) &&
+        Formio.setProjectUrl(window.FORMIO_SETTINGS.url.slice(0, -1)) &&
+        Formio.setApiUrl(window.FORMIO_SETTINGS.url.slice(0, -1));
+
         var token = response.headers('x-jwt-token');
         if (response.status >= 200 && response.status < 300 && token && token !== '') {
           Formio.setToken(token);
