Changeset 40ee398 in OpenWorkouts-current

Timestamp:

Feb 6, 2019, 1:02:29 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

a3c3baa

Parents:

eed2019

Message:

Fixed broken selectors in the last-12-months chart in the user profile page

Location:

ow

Files:

• static/js/ow.js (modified) (3 diffs)
• templates/profile.pt (modified) (1 diff)

ow/static/js/ow.js

@@ -251 +251 @@
         filters_selector = spec.filters_selector,
         switcher_selector = spec.switcher_selector,
+        is_active_class = spec.is_active_class,
+        is_active_selector = '.' + is_active_class,
         urls = spec.urls,
         current_month = spec.current_month,
@@ -287 +289 @@
         $(filters_selector).on('click', function(e) {
             e.preventDefault();
+            $(filters_selector + is_active_selector).removeClass(is_active_class);
+            /* $(this).removeClass('is-active'); */
             filter_by = $(this).attr('class').split('-')[1]
+            $(this).addClass(is_active_class);
             var chart = d3.select(chart_selector);
             chart.selectAll("*").remove();
             render(filter_by, url);
+
         });
     };
@@ -297 +303 @@
         $(switcher_selector).on('click', function(e) {
             e.preventDefault();
+            $(switcher_selector + is_active_selector).removeClass(is_active_class);
             url = $(this).attr('class').split('-')[1]
+            $(this).addClass(is_active_class);
             var chart = d3.select(chart_selector);
             chart.selectAll("*").remove();

ow/templates/profile.pt

@@ -177 +177 @@
          filters_selector: '.js-month-stats .js-filters a',
          switcher_selector: '.js-month-stats .js-switcher a',
+         is_active_class: 'is-active',
          urls: {"monthly": "${request.resource_url(context, 'monthly')}",
                 "weekly": "${request.resource_url(context, 'weekly')}"},