Fixed #16: Better way to store webpush data in DOM

webpush/static/webpush/webpush.js

@@ -131,16 +131,14 @@ function postSubscribeObj(statusType, subscription) {
   // and the push subscription endpoint + key the server needs
   // to send push messages
 
-  var element = document.getElementById('webpush-data'),
-    push_url = element.dataset.url,
-    browser = navigator.userAgent.match(/(firefox|msie|chrome|safari|trident)/ig)[0].toLowerCase(),
+  var browser = navigator.userAgent.match(/(firefox|msie|chrome|safari|trident)/ig)[0].toLowerCase(),
     data = {  status_type: statusType,
               subscription: subscription.toJSON(),
               browser: browser,
-              group: element.dataset.group
+              group: subBtn.dataset.group
            };
 
-  fetch(push_url, {
+  fetch(subBtn.dataset.url, {
     method: 'post',
     headers: {'Content-Type': 'application/json'},
     body: JSON.stringify(data),

webpush/templates/webpush.html

@@ -1,11 +1,7 @@
 {% if request.user.is_authenticated or group %}
-
   {% load staticfiles %}
-  <script id="webpush-js" type="text/javascript" src="{% static 'webpush/webpush.js' %}"></script>
 
+  <script id="webpush-js" type="text/javascript" src="{% static 'webpush/webpush.js' %}"></script>
   <script id="service-worker-js" type="text/javascript" src="{% static 'webpush/webpush_serviceworker.js' %}"></script>
-
   <link rel="manifest" href="{% url 'webpush_manifest_json' %}">
-
-  <div id="webpush-data" {% if group %} data-group="{{ group }}" {% endif %} data-url="{{ url }}" hidden></div>
 {% endif %}

webpush/templates/webpush_button.html

@@ -1,4 +1,6 @@
 {% if request.user.is_authenticated or group %}
-  <button id="webpush-subscribe-button"> Subscribe to Push Messaging </button>
+  <button id="webpush-subscribe-button" {% if group %}data-group="{{ group }}"{% endif %} data-url="{{ url }}">
+    Subscribe to Push Messaging
+  </button>
   <div id="webpush-message" hidden></div>
-{% endif %}
+{% endif %}

webpush/templatetags/webpush_notifications.py

@@ -1,6 +1,4 @@
 from django import template
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 
 register = template.Library()
@@ -9,23 +7,15 @@
 @register.filter
 @register.inclusion_tag('webpush.html', takes_context=True)
 def webpush(context):
-  group = context.get("webpush", {}).get("group")
-
-  url = reverse('save_webpush_info')
-  request = context["request"]
-
-  return { 'group': group,
-           'url': url,
-           "request": request
-          }
+    group = context.get('webpush', {}).get('group')
+    request = context['request']
+    return {'group': group, 'request': request}
 
 
 @register.filter
 @register.inclusion_tag('webpush_button.html', takes_context=True)
 def webpush_button(context):
-  group = context.get("webpush", {}).get("group")
-  request = context["request"]
-
-  return {"group": group,
-          "request": request
-         }
+    group = context.get('webpush', {}).get('group')
+    url = reverse('save_webpush_info')
+    request = context['request']
+    return {'group': group, 'url': url, 'request': request}