Changeset 4501

Timestamp:

01/23/12 15:53:56 (4 months ago)

Author:

johnnyoffline

Message:

added an app.yml option to return email links in a different format that allows apostrophe.unobfuscateEmailInline to be called outside of the a_js spool

app.yml flag is:

a:

inline_obfuscate_mailto: true

Location:

plugins/apostrophePlugin/branches/1.5

Files:

• lib/toolkit/aHtml.class.php (modified) (1 diff)
• web/js/a.js (modified) (1 diff)

plugins/apostrophePlugin/branches/1.5/lib/toolkit/aHtml.class.php

@@ -673 +673 @@
     // This is worth it to produce cacheable content though
     $class = 'a-email-' . sprintf("%u", crc32($user . '@' . $domain . ':' . $label));
-    $href = rawurlencode("mailto:$user@$domain");
-    $label = rawurlencode(trim($label));
-    // This is an acceptable way to stub in a js call for now, since it's the
-    // way the helper has to do it too
-    aTools::$jsCalls[] = array('callable' => 'apostrophe.unobfuscateEmail(?, ?, ?)', 'args' => array($class, $href, $label));
-    return "<a href='#' class='$class'></a>";
+    $href = "mailto:$user@$domain";
+    if (sfConfig::get('app_a_inline_obfuscate_mailto'))
+    {
+      $result = '<a href="#" class="a-obs-email ' . $class . '" data-prefix="' . $user . '" data-suffix="' . $domain . '" data-label="' . $label . '"></a>';
+    }
+    else
+    {
+      // This is an acceptable way to stub in a js call for now, since it's the
+      // way the helper has to do it too
+      $result = "<a href='#' class='$class'></a>";  
+      $label = rawurlencode(trim($label));          
+      $href = rawurlencode($href);      
+      aTools::$jsCalls[] = array('callable' => 'apostrophe.unobfuscateEmail(?, ?, ?)', 'args' => array($class, $href, $label));
+    }
+    return $result;
   }
 

plugins/apostrophePlugin/branches/1.5/web/js/a.js

@@ -340 +340 @@
         this.unobfuscateEmail = function(aClass, email, label)
         {
+          aLog('apostrophe.unobfuscateEmail -- ' + aClass + ', ' + email + ', ' + label);
                 $('.' + aClass).attr('href', unescape(email)).html(unescape(label));
         };
+
+
+  /**
+    apostrophe.unobfuscateEmailInline -- works in conjunction with an app.yml flag:
+    //  a:
+    //    inline_obfuscate_mailto: true
+    To unobfuscate all emails loaded on a page after a_js has fired.
+  */
+  this.unobfuscateEmailInline = function() {
+    var links = $('.a-obs-email');
+    if (links.length) 
+    {
+      links.each(function(){
+        $self = $(this);
+        $self.attr('href', 'mailto:' + $self.attr('data-prefix') + '@' + $self.attr('data-suffix')).html($self.attr('data-label'));
+      });
+    };
+  };
 
         // Turns a form into an AJAX form that updates the element