From 19ec1d7e4325df4b802acf1c0b57f6e447601b92 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 May 2014 20:08:00 +0200
Subject: Add cookie-base comparison list.

---
 web/lib/javascript.rb    | 1 +
 web/lib/ui/comparison.rb | 2 +-
 web/lib/ui/keys.rb       | 2 +-
 web/lib/ui/tags.rb       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'web/lib')

diff --git a/web/lib/javascript.rb b/web/lib/javascript.rb
index 5cf0a5a..cb73ff7 100644
--- a/web/lib/javascript.rb
+++ b/web/lib/javascript.rb
@@ -18,6 +18,7 @@ class Javascript
     @@js_files = {
 #        :common    => [ 'jquery-1.9.0.min', 'jquery-ui-1.9.2.custom.min', 'customSelect.jquery.min', 'jquery.tipsy-minified' ],
         :common    => [ 'common' ],
+        :cookie    => [ 'jquery.cookie-minified' ],
         :taginfo   => [ 'taginfo' ],
         :flexigrid => [ 'jquery-migrate-1.0.0.min', 'flexigrid-minified' ],
         :d3        => [ 'd3/d3.v3.min' ],
diff --git a/web/lib/ui/comparison.rb b/web/lib/ui/comparison.rb
index 611d62e..4bc5d46 100644
--- a/web/lib/ui/comparison.rb
+++ b/web/lib/ui/comparison.rb
@@ -15,7 +15,7 @@ class Taginfo < Sinatra::Base
             params[:key].each_with_index do |key, index|
                 @data << {
                     :key => key,
-                    :value => (params[:value].is_a?(Array) ? params[:value][index] : nil)
+                    :value => (params[:value].is_a?(Array) ? (params[:value][index] == '' ? nil : params[:value][index]) : nil)
                 }
             end
         end
diff --git a/web/lib/ui/keys.rb b/web/lib/ui/keys.rb
index 1ffc8eb..5b8af23 100644
--- a/web/lib/ui/keys.rb
+++ b/web/lib/ui/keys.rb
@@ -52,7 +52,7 @@ class Taginfo < Sinatra::Base
         @img_width  = TaginfoConfig.get('geodistribution.width')  * TaginfoConfig.get('geodistribution.scale_image')
         @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image')
 
-        javascript_for(:flexigrid, :d3)
+        javascript_for(:flexigrid, :cookie, :d3)
         javascript "#{ r18n.locale.code }/key"
         erb :key
     end
diff --git a/web/lib/ui/tags.rb b/web/lib/ui/tags.rb
index 4250b33..4ba184c 100644
--- a/web/lib/ui/tags.rb
+++ b/web/lib/ui/tags.rb
@@ -60,7 +60,7 @@ class Taginfo < Sinatra::Base
         @img_width  = TaginfoConfig.get('geodistribution.width')  * TaginfoConfig.get('geodistribution.scale_image')
         @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image')
 
-        javascript_for(:flexigrid)
+        javascript_for(:flexigrid, :cookie)
         javascript "#{ r18n.locale.code }/tag"
         erb :tag
     end
-- 
cgit v1.2.3