it-logica-application-backbone 1.0.48 → 1.0.49

data/VERSION

@@ -1 +1 @@
-1.0.48
+1.0.49

data/app/assets/javascripts/backbone_js/ladas_loading.js

@@ -65,7 +65,8 @@ function load_page(settings, caller_object) {
                     data['status'] ? Alert.set_status(data['status']) : Alert.set_status("");
                     //alert(data['message']);
 
-
+                    // loading hide must be here if is there is another load_page, loading will begin again
+                    ladas_loading_hide();
                     if (data['settings']) {
                         load_page(data['settings']);
                     }
@@ -75,6 +76,8 @@ function load_page(settings, caller_object) {
                     }
                 }
                 else {
+                    // loading hide must be here if is there is another load_page in the html received, loading will begin again
+                    ladas_loading_hide();
                     $(content_id).html(data);
                     $(content_id).find("textarea.tinymce").LadasTinyMce();
                     //console.log($(content_id).find("textarea.datafile_tinymce"));
@@ -87,7 +90,7 @@ function load_page(settings, caller_object) {
                     $(document).trigger('page_loader.loaded',[settings]);
                 }
 
-                ladas_loading_hide();
+
             },
             error:function (jqXHR, textStatus, errorThrown) {
                 ladas_loading_hide();

data/app/views/helpers/_build_table_filter.html.erb

@@ -16,14 +16,18 @@
 
 <%#= javascript_include_tag '/assets/backbone_js/tmpl.min.js' %>
 <script type="text/javascript">
+    ladas_loading_show();
     $(document).ready(function () {
         <% if settings[:template].blank? %>
+        ladas_loading_show();
         var initial_parsed_data = jQuery.parseJSON('<%= j settings.to_json.html_safe %>');
         var html_from_json = TableBuilder.render_tbody(initial_parsed_data);
         TableSummaries.refresh(initial_parsed_data);
 
         $("#<%= settings[:form_id] %>_ajax_content").html(html_from_json);
         apply_modifiers_of_the_table($("#<%= settings[:form_id] %>_ajax_content"));
+
+        ladas_loading_hide();
         <% end %>
         formatLinkForPaginationURL('<%= settings[:form_id] %>');
 

data/it-logica-application-backbone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.0.48"
+  s.version = "1.0.49"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.48
+  version: 1.0.49
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &86012340 !ruby/object:Gem::Requirement
+  requirement: &71831680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86012340
+  version_requirements: *71831680
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &86011800 !ruby/object:Gem::Requirement
+  requirement: &71372900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86011800
+  version_requirements: *71372900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &86011320 !ruby/object:Gem::Requirement
+  requirement: &71372240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *86011320
+  version_requirements: *71372240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &86010910 !ruby/object:Gem::Requirement
+  requirement: &71371770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *86010910
+  version_requirements: *71371770
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &86010580 !ruby/object:Gem::Requirement
+  requirement: &71371280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *86010580
+  version_requirements: *71371280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &86010170 !ruby/object:Gem::Requirement
+  requirement: &71370930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86010170
+  version_requirements: *71370930
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -595,7 +595,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -281277251
+      hash: 711961295
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: