it-logica-application-backbone 0.2.30 → 0.2.31

data/VERSION

@@ -1 +1 @@
-0.2.30
+0.2.31

data/app/assets/javascripts/backbone_js/ladas_breadcrumb.js.coffee

@@ -25,24 +25,29 @@ class Breadcrumbs
     $('a[data-breadcrumb-id],li[data-breadcrumb-id]').each (index, element) =>
       $(element).removeClass('active')
 
-    $('.breadcrumb li').each (index, element) =>
+    $('.main_breadcrumb li').each (index, element) =>
       bc = $(element)
       href = bc.find('a')
       if href.length > 0
         text = href.html()
       else
         text = bc.html()
+
+      text = text.replace(/\n/g, ' ').replace(/\r/g, ' ');
+      console.log(text)
+
       Breadcrumbs.mark_menu_item(text)
-      Breadcrumbs.change_document_title(title_prefix, title_suffix, text) if (index + 1) >= $('.breadcrumb li').length
+      Breadcrumbs.change_document_title(title_prefix, title_suffix, text) if (index + 1) >= $('.main_breadcrumb li').length
 
     # default title if there is no breadcrumbs
-    Breadcrumbs.change_document_title("","", title_default) if $('.breadcrumb li').lenght <= 0
+    Breadcrumbs.change_document_title("","", title_default) if $('.main_breadcrumb li').lenght <= 0
 
 
   @mark_menu_item: (val) ->
     finding_string = "li[data-breadcrumb-id='" + val + "']"
     finding_string += ",a[data-breadcrumb-id='" + val + "']"
     #console.log $(finding_string)
+
     found = $(finding_string)
     found.addClass('active') if found
 

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

@@ -100,7 +100,7 @@ function filter_sort(form_id, order_by_value, dir, obj) {
     var order_by_id = '#' + form_id + '_order_by';
     var default_order_by_val = $('#' + form_id + '_default_order_by').val().toLowerCase();
 
-    var order_by_array = $(order_by_id).val().split(",");
+    var order_by_array = $(order_by_id).val().toLowerCase().split(",");
     //console.log(order_by_value)
     //console.log(dir)
     //console.log(order_by_array);

data/app/assets/javascripts/backbone_js/ladas_table_builder.js.coffee

@@ -13,21 +13,20 @@ class TableBuilder
       do (row) ->
         TableBuilder.html += '<tr>'
 
-        TableBuilder.add_row_functions()
+        TableBuilder.add_row_functions(row)
         TableBuilder.add_row_columns(row)
 
         TableBuilder.html += '</tr>'
   @make_row: ->
 
 
-  @add_row_functions: ->
-    if (TableBuilder.obj.row.functions)
+  @add_row_functions:(row) ->
+    if TableBuilder.obj.row? && TableBuilder.obj.row.functions?
       TableBuilder.html += '<td>'
 
-      for function_name in TableBuilder.obj.row.functions.data
-        do (function_name) ->
-          settings = o.row.functions[function_name]
-          TableBuilder.make_row_function_button(settings, row, col)
+
+      for function_name, settings of TableBuilder.obj.row.functions
+        TableBuilder.make_row_function_button(settings, row)
 
       TableBuilder.html += '</td>'
 
@@ -47,7 +46,7 @@ class TableBuilder
           one_cell_buttons = row[col.table + '_' + col.name]
           for one_cell_button in one_cell_buttons
             do (one_cell_button) ->
-              one_cell_button = {} if !button_settings?
+              one_cell_button = {} if !one_cell_buttons?
               TableBuilder.make_column_from_hash(one_cell_button, row, col)
 
         else if (is_string(row[col.table + '_' + col.name]))

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

@@ -1,4 +1,4 @@
-<ul class="breadcrumb">
+<ul class="breadcrumb main_breadcrumb">
   <li>
     <%= ajax_link_to "Úvodní stránka", "/" %>
     <% if !breadcrumb.blank? %>

data/it-logica-application-backbone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "0.2.30"
+  s.version = "0.2.31"
 
   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: 0.2.30
+  version: 0.2.31
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &77155570 !ruby/object:Gem::Requirement
+  requirement: &81098420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77155570
+  version_requirements: *81098420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77155080 !ruby/object:Gem::Requirement
+  requirement: &81097900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77155080
+  version_requirements: *81097900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77154440 !ruby/object:Gem::Requirement
+  requirement: &81097330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77154440
+  version_requirements: *81097330
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77153660 !ruby/object:Gem::Requirement
+  requirement: &81096460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *77153660
+  version_requirements: *81096460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77153040 !ruby/object:Gem::Requirement
+  requirement: &81095920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77153040
+  version_requirements: *81095920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77152570 !ruby/object:Gem::Requirement
+  requirement: &81095470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77152570
+  version_requirements: *81095470
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -563,7 +563,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 71327005
+      hash: 33626109
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: