[ckan-changes] [okfn/ckan] 42c16b: [#2304] Javascript code formatting tweaks

Mon Apr 30 16:15:03 UTC 2012

Branch: refs/heads/feature-2304-follow
  Home:   https://github.com/okfn/ckan
  Commit: 42c16b54d0b5b758615e2ed99b59d21c1497d7ca
      https://github.com/okfn/ckan/commit/42c16b54d0b5b758615e2ed99b59d21c1497d7ca
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2304] Javascript code formatting tweaks

diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 742644c..5988fe0 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -1418,14 +1418,11 @@ CKAN.Utils = function($, my) {
   };
 
   my.setupUserFollowButton = function() {
-    if ($('#user_follow_button').attr('state') == 'follow')
-    {
+    if ($('#user_follow_button').attr('state') == 'follow') {
         $('#user_follow_button').off("click", userUnfollowClicked);
         $('#user_follow_button').html('Follow');
         $('#user_follow_button').on("click", userFollowClicked);
-    }
-    else
-    {
+    } else {
         $('#user_follow_button').off("click", userFollowClicked);
         $('#user_follow_button').html('Unfollow');
         $('#user_follow_button').on("click", userUnfollowClicked);
@@ -1433,14 +1430,11 @@ CKAN.Utils = function($, my) {
   };
 
   my.setupDatasetFollowButton = function() {
-    if ($('#dataset_follow_button').attr('state') == 'follow')
-    {
+    if ($('#dataset_follow_button').attr('state') == 'follow') {
         $('#dataset_follow_button').off("click", datasetUnfollowClicked);
         $('#dataset_follow_button').html('Follow');
         $('#dataset_follow_button').on("click", datasetFollowClicked);
-    }
-    else
-    {
+    } else {
         $('#dataset_follow_button').off("click", datasetFollowClicked);
         $('#dataset_follow_button').html('Unfollow');
         $('#dataset_follow_button').on("click", datasetUnfollowClicked);


================================================================
  Commit: 8b16f6aeb19673c89ad5cc561ef9a2d5c6ac81fb
      https://github.com/okfn/ckan/commit/8b16f6aeb19673c89ad5cc561ef9a2d5c6ac81fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2304] Make follow button js a bit more efficient


diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 5988fe0..77b2981 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -1418,26 +1418,28 @@ CKAN.Utils = function($, my) {
   };
 
   my.setupUserFollowButton = function() {
-    if ($('#user_follow_button').attr('state') == 'follow') {
-        $('#user_follow_button').off("click", userUnfollowClicked);
-        $('#user_follow_button').html('Follow');
-        $('#user_follow_button').on("click", userFollowClicked);
+    var userFollowButton = $('#user_follow_button');
+    if (userFollowButton.attr('state') == 'follow') {
+        userFollowButton.off("click", userUnfollowClicked);
+        userFollowButton.html('Follow');
+        userFollowButton.on("click", userFollowClicked);
     } else {
-        $('#user_follow_button').off("click", userFollowClicked);
-        $('#user_follow_button').html('Unfollow');
-        $('#user_follow_button').on("click", userUnfollowClicked);
+        userFollowButton.off("click", userFollowClicked);
+        userFollowButton.html('Unfollow');
+        userFollowButton.on("click", userUnfollowClicked);
     }
   };
 
   my.setupDatasetFollowButton = function() {
-    if ($('#dataset_follow_button').attr('state') == 'follow') {
-        $('#dataset_follow_button').off("click", datasetUnfollowClicked);
-        $('#dataset_follow_button').html('Follow');
-        $('#dataset_follow_button').on("click", datasetFollowClicked);
+    var datasetFollowButton = $('#dataset_follow_button');
+    if (datasetFollowButton.attr('state') == 'follow') {
+        datasetFollowButton.off("click", datasetUnfollowClicked);
+        datasetFollowButton.html('Follow');
+        datasetFollowButton.on("click", datasetFollowClicked);
     } else {
-        $('#dataset_follow_button').off("click", datasetFollowClicked);
-        $('#dataset_follow_button').html('Unfollow');
-        $('#dataset_follow_button').on("click", datasetUnfollowClicked);
+        datasetFollowButton.off("click", datasetFollowClicked);
+        datasetFollowButton.html('Unfollow');
+        datasetFollowButton.on("click", datasetUnfollowClicked);
     }
   };
 


================================================================
  Commit: eaf8fdf9af5b01fc12f0d992f78176c8619e7359
      https://github.com/okfn/ckan/commit/eaf8fdf9af5b01fc12f0d992f78176c8619e7359
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2304] Change a js == to ===


diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 77b2981..6037459 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -1419,7 +1419,7 @@ CKAN.Utils = function($, my) {
 
   my.setupUserFollowButton = function() {
     var userFollowButton = $('#user_follow_button');
-    if (userFollowButton.attr('state') == 'follow') {
+    if (userFollowButton.attr('state') === 'follow') {
         userFollowButton.off("click", userUnfollowClicked);
         userFollowButton.html('Follow');
         userFollowButton.on("click", userFollowClicked);
@@ -1432,7 +1432,7 @@ CKAN.Utils = function($, my) {
 
   my.setupDatasetFollowButton = function() {
     var datasetFollowButton = $('#dataset_follow_button');
-    if (datasetFollowButton.attr('state') == 'follow') {
+    if (datasetFollowButton.attr('state') === 'follow') {
         datasetFollowButton.off("click", datasetUnfollowClicked);
         datasetFollowButton.html('Follow');
         datasetFollowButton.on("click", datasetFollowClicked);


================================================================
Compare: https://github.com/okfn/ckan/compare/6a27937...eaf8fdf
