ie8 javascript fixes around poll

mikemintz · Jun 12, 2013 · 3465e36 · 3465e36
1 parent ea22066
commit 3465e36
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/deme_django/modules/poll/views.py b/deme_django/modules/poll/views.py
@@ -125,6 +125,8 @@ def item_show_html(self):
         if memberships:
             self.permission_cache.filter_items('view Item.name', Item.objects.filter(pk__in=[x.item_id for x in memberships]))
         self.context['responses'] = PropositionResponseApprove.objects.filter(poll=self.item)
+        if not self.item.eligibles:
+            return self.render_error('No eligibles chosen', "Please edit this poll and choose a group of eligible participants")
         eligible_agent_memberships = self.item.eligibles.child_memberships
         eligible_agent_memberships = eligible_agent_memberships.filter(active=True, item__active=True)
         eligible_agent_memberships = self.permission_cache.filter_items('view Membership.item', eligible_agent_memberships)

diff --git a/deme_django/static/javascripts/deme/ajax-model-choice-widget-ck.js b/deme_django/static/javascripts/deme/ajax-model-choice-widget-ck.js
diff --git a/deme_django/static/javascripts/deme/ajax-model-choice-widget.js b/deme_django/static/javascripts/deme/ajax-model-choice-widget.js
@@ -32,7 +32,7 @@ $(function() {
                 cache[term] = normalized_data;
                 response(normalized_data);
             });
-        },
+        }
     });
 
     // set up new button
@@ -43,7 +43,7 @@ $(function() {
       var list_modal_url = hidden_input.attr('data-list-modal-url');
 
       var random_num = Math.floor((Math.random()*1000000)+1);
-      window.open(list_modal_url, 'embedform-' + random_num, 'width=600,toolbar=1,resizable=1,scrollbars=yes,height=600,top=100,left=100');
+      window.open(list_modal_url, 'embedform' + random_num, 'width=600,toolbar=1,resizable=1,scrollbars=yes,height=600,top=100,left=100');
     });
 
     hidden_input.addClass('ajax-model-choice-widget-processed');

diff --git a/deme_django/static/javascripts/deme/metabar_swap.js b/deme_django/static/javascripts/deme/metabar_swap.js
@@ -27,7 +27,7 @@ $(function(){
 
       //New height and width
       var winNewWidth = $(window).width(),
-      winNewHeight = $(window).height();
+         winNewHeight = $(window).height();
 
       // compare the new height and width with old one
       if(winWidth!=winNewWidth || winHeight!=winNewHeight)