Better control over the Ajax-based page content refreshing.

rapidoid · May 18, 2016 · 132f0e4 · 132f0e4
1 parent 40cc917
commit 132f0e4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/assets/angular/emit.js b/assets/angular/emit.js
@@ -92,14 +92,15 @@ Rapidoid.initializer(function($scope) {
 
         btn.append(' <i class="fa fa-refresh fa-spin"></i>');
 
-        $.post(window.location.href, inputs).done(function(data) {
+        var loc = Rapidoid.location || window.location.href;
+        $.post(loc, inputs).done(function(data) {
 
             if (typeof data === 'string' || data instanceof String) {
 
                 if (go && data.indexOf('class="field-error"') < 0) {
                     Rapidoid.goAt(go);
                 } else {
-                    $scope.ajaxBodyContent = data + '<!--' + reqId + '-->';
+                    $scope[Rapidoid.holder] = data + '<!--' + reqId + '-->';
                     $scope.$apply();
                 }
 

diff --git a/assets/rapidoid/rapidoid-extras.js b/assets/rapidoid/rapidoid-extras.js
@@ -11,7 +11,13 @@ Rapidoid = (function() {
     // rel="stylesheet">');
     // }
 
+    var initialized = false;
     function _init() {
+        if(initialized) {
+            return;
+        }
+        initialized = true;
+
         $(function () {
 
         $('[data-toggle="tooltip"]').tooltip();
@@ -120,6 +126,8 @@ Rapidoid = (function() {
     }
 
     function _initScope($scope) {
+        Rapidoid.scope = $scope;
+
         for (var i = 0; i < scopeInitializers.length; i++) {
             scopeInitializers[i]($scope);
         }
@@ -178,7 +186,8 @@ Rapidoid = (function() {
         createApp : createApp,
         initializer : initializer,
         plugin : plugin,
-        initApp : initApp
+        initApp : initApp,
+        holder: 'ajaxBodyContent'
     };
 
 })();

diff --git a/rapidoid-html/src/main/resources/default/static/rapidoid.min.js b/rapidoid-html/src/main/resources/default/static/rapidoid.min.js