cronapp-framework-js 2.8.28 → 2.8.29

package/js/app.js

@@ -212,7 +212,7 @@ var app = (function() {
         $scope.UploadService = UploadService;
         $scope.$state = $state;
 
-        app.registerEventsCronapi($scope, $translate);
+        app.registerEventsCronapi($scope, $translate, $location);
 
         $("form").kendoValidator({
             errorTemplate: '<span class="k-widget k-tooltip-validation k-x-invalid-msg-block">#=message#</span>',
@@ -365,7 +365,23 @@ app.bindScope = function($scope, obj) {
   return newObj;
 };
 
-app.registerEventsCronapi = function($scope, $translate) {
+app.registerEventsCronapi = function($scope, $translate, $location) {
+
+  let $stateParams = $scope.params || {};
+  let queryStringParams = $location && $location.search() || {};
+  $scope.params = {};
+
+  let makeCopy = (from, to) => {
+      for (let key in from) {
+          if (from.hasOwnProperty(key)) {
+              to[key] = from[key];
+          }
+      }
+  };
+  makeCopy($stateParams, $scope.params);
+  makeCopy(queryStringParams, $scope.params);
+
+
   for (var x in app.userEvents)
     $scope[x] = app.userEvents[x].bind($scope);
 

package/js/controllers.js

@@ -81,7 +81,7 @@
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
-    app.registerEventsCronapi($scope, $translate);
+    app.registerEventsCronapi($scope, $translate, $location);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -91,12 +91,6 @@
       ReportService.openReport(reportName, params, config);
     };
 
-    var queryStringParams = $location.search();
-    for (var key in queryStringParams) {
-      if (queryStringParams.hasOwnProperty(key)) {
-        $scope.params[key] = queryStringParams[key];
-      }
-    }
     $scope.redirectToLogin = function() {
       $scope.cronapi.social.ssoLogin();
     };
@@ -250,7 +244,7 @@
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
-    app.registerEventsCronapi($scope, $translate);
+    app.registerEventsCronapi($scope, $translate, $location);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -260,13 +254,6 @@
       ReportService.openReport(reportName, params, config);
     };
 
-    var queryStringParams = $location.search();
-    for (var key in queryStringParams) {
-      if (queryStringParams.hasOwnProperty(key)) {
-        $scope.params[key] = queryStringParams[key];
-      }
-    }
-
     $scope.message = {};
 
     $scope.selecionado = {

package/js/directives.js

@@ -3517,6 +3517,7 @@
             }
           },
           link: async function (scope, element, attrs, ngModelCtrl) {
+            await cronapi.internal.skipIterationLoop();
             var modelGetter = $parse(attrs['ngModel']);
             var modelSetter = modelGetter.assign;
             var select = {};
@@ -4710,14 +4711,22 @@
         return {
           restrict: 'A',
           require: 'ngModel',
-          link: function(scope, element, attrs, ngModelCtrl) {
+          link: async function(scope, element, attrs, ngModelCtrl) {
             if (attrs.ngInitialValue) {
               var modelGetter = $parse(attrs['ngModel']);
               var modelSetter = modelGetter.assign;
               var evaluated;
 
               try {
-                evaluated = scope.$eval(attrs.ngInitialValue);
+                if(attrs.ngInitialValue.indexOf("cronapi.client('js.") != -1){//cronapi caller?
+                    let shortVersion = attrs.ngInitialValue.replace("cronapi.client('js.", 'blockly.js.');
+                    let blocklyPackage = shortVersion.split("').names")[0];
+                    blocklyPackage = blocklyPackage.split("').attr()")[0];
+                    let blocklyParams = shortVersion.split('.run')[1];
+                    evaluated = await scope.$eval(blocklyPackage + blocklyParams); 
+                } else {
+                    evaluated = scope.$eval(attrs.ngInitialValue);
+                }
               } catch (e) {
                 evaluated = attrs.ngInitialValue;
               }
@@ -4777,7 +4786,7 @@
                     viewValue = null;
                     el.prop('indeterminate', true);
                 }
-                ctrl.$setViewValue(viewValue);
+                setTimeout(() => ctrl.$setViewValue(viewValue));
               };
             } else if (attrs.crnAllowNullValues == 'false') {
               ctrl.$render = function () {
@@ -4787,7 +4796,7 @@
                   viewValue = false;
                 }
                 if (viewValue === falseValue) {
-                  let modelForEval = `${el.attr('ng-model')}=${viewValue}`;
+                  let modelForEval = `${el.attr('ng-model')}=${attrs.ngFalseValue}`;
                   scope.$eval(modelForEval);
                 }
                 el.data('checked', viewValue);
@@ -4804,7 +4813,7 @@
                     viewValue = falseValue;
                     break;
                 }
-                ctrl.$setViewValue(viewValue);
+                setTimeout(() => ctrl.$setViewValue(viewValue));
               };
             }
             el.bind('click', function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-js",
-  "version": "2.8.28",
+  "version": "2.8.29",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {