Fixed issue with translation of dotvvm.api.isLoading

riganti · Mar 22, 2023 · 25d391f · 25d391f
1 parent 4b18f82
commit 25d391f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/Framework/Framework/Binding/HelperNamespace/BindingApi.cs b/src/Framework/Framework/Binding/HelperNamespace/BindingApi.cs
@@ -44,7 +44,7 @@ public static void RegisterJavascriptTranslations(JavascriptTranslatableMethodCo
                 ));
             methods.AddPropertyGetterTranslator(typeof(BindingApi), nameof(IsLoading),
                 new GenericMethodCompiler(a =>
-                    new JsIdentifierExpression("dotvvm").Member("api").Member("isLoading").Invoke()
+                    new JsIdentifierExpression("dotvvm").Member("api").Member("isLoading")
                         .WithAnnotation(ResultIsObservableAnnotation.Instance)));
         }
     }

diff --git a/src/Samples/Common/Views/FeatureSamples/Api/IsLoading.dothtml b/src/Samples/Common/Views/FeatureSamples/Api/IsLoading.dothtml
@@ -23,6 +23,7 @@
     </div>
 
     <div data-ui="loading" Visible="{value: _api.IsLoading}">LOADING</div>
+    <div data-ui="not-loading" Visible="{value: !_api.IsLoading}">NOT LOADING</div>
 
 </body>
 </html>

diff --git a/src/Samples/Tests/Tests/Feature/ApiTests.cs b/src/Samples/Tests/Tests/Feature/ApiTests.cs
@@ -506,21 +506,27 @@ public void Feature_Api_IsLoading()
                 browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_Api_IsLoading);
                 
                 var loading = browser.Single("loading", SelectByDataUi);
+                var notLoading = browser.Single("not-loading", SelectByDataUi);
                 AssertUI.IsNotDisplayed(loading);
+                AssertUI.IsDisplayed(notLoading);
 
                 browser.Single("number1", SelectByDataUi).Single("input[type=button]").Click();
                 AssertUI.IsDisplayed(loading);
+                AssertUI.IsNotDisplayed(notLoading);
 
                 Thread.Sleep(500);
                 browser.Single("number2", SelectByDataUi).Single("input[type=button]").Click();
                 AssertUI.IsDisplayed(loading);
+                AssertUI.IsNotDisplayed(notLoading);
 
                 Thread.Sleep(500);
                 browser.Single("number3", SelectByDataUi).Single("input[type=button]").Click();
                 AssertUI.IsDisplayed(loading);
+                AssertUI.IsNotDisplayed(notLoading);
 
                 Thread.Sleep(3000);
                 AssertUI.IsNotDisplayed(loading);
+                AssertUI.IsDisplayed(notLoading);
             });
         }