From bd78c4a789ea2ae03526e7468591847159f90f52 Mon Sep 17 00:00:00 2001
From: Yoz Grahame <yoz@yoz.com>
Date: Sun, 23 Jun 2013 19:06:08 -0700
Subject: [PATCH 1/2] onHighlight() adds to an array of callbacks rather than
 overwriting previous

---
 js/rainbow.js  | 11 ++++++-----
 tests/api.html | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/js/rainbow.js b/js/rainbow.js
index c6d5f517..c502a907 100644
--- a/js/rainbow.js
+++ b/js/rainbow.js
@@ -84,9 +84,9 @@ window['Rainbow'] = (function() {
         global_class,
 
         /**
-         * @type {null|Function}
+         * @type {Array}
          */
-        onHighlight;
+        onHighlight = [];
 
     /**
      * cross browser get attribute for an element
@@ -631,8 +631,9 @@ window['Rainbow'] = (function() {
                     replacement_positions = {};
 
                     // if you have a listener attached tell it that this block is now highlighted
-                    if (onHighlight) {
-                        onHighlight(block, language);
+                    if (onHighlight.length > 0) {
+                        for(i=0; i<onHighlight.length; i++)
+                        onHighlight[i](block, language);
                     }
 
                     // process the next block
@@ -739,7 +740,7 @@ window['Rainbow'] = (function() {
          * @param {Function} callback
          */
         onHighlight: function(callback) {
-            onHighlight = callback;
+            onHighlight.push(callback);
         },
 
         /**
diff --git a/tests/api.html b/tests/api.html
index 74e0e037..2349b392 100644
--- a/tests/api.html
+++ b/tests/api.html
@@ -49,5 +49,31 @@ <h1>API Test Page</h1>
                 $("#stuff").append('<p>got callback<p>');
             });
         }, 1000);
+
+        // Set an onHighlight() callback
+        setTimeout(function() {
+            Rainbow.onHighlight(function(){
+                $("#stuff").append('<p>Got onHighlight() callback</p>')
+            });
+
+            $("#stuff").append('<p>code inserted dynamically with callback:</p><pre><code data-language="javascript">var html = $("#stuff").html();</code></pre>');
+            Rainbow.color();
+        }, 1250);
+
+        // Set multiple onHighlight() callbacks
+        setTimeout(function() {
+            Rainbow.onHighlight(function(){
+                window._OHTest = 1;
+            });
+
+            Rainbow.onHighlight(function(){
+                window._OHTest++;
+                $("#stuff").append('<p>This number should be 2: <b>'
+                    + window._OHTest + '</b></p>');
+            });
+
+            $("#stuff").append('<p>code inserted dynamically with callback:</p><pre><code data-language="javascript">var html = $("#stuff").html();</code></pre>');
+            Rainbow.color();
+        }, 1500);
     </script>
 </body>

From c7430c9a46f15d4e12e84500134f8e8f21ac19a1 Mon Sep 17 00:00:00 2001
From: Yoz Grahame <yoz@yoz.com>
Date: Mon, 24 Jun 2013 16:22:42 -0700
Subject: [PATCH 2/2] Fix for-loop variable collision

---
 js/rainbow.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/rainbow.js b/js/rainbow.js
index c502a907..4671d432 100644
--- a/js/rainbow.js
+++ b/js/rainbow.js
@@ -632,8 +632,8 @@ window['Rainbow'] = (function() {
 
                     // if you have a listener attached tell it that this block is now highlighted
                     if (onHighlight.length > 0) {
-                        for(i=0; i<onHighlight.length; i++)
-                        onHighlight[i](block, language);
+                        for(ohn=0; ohn<onHighlight.length; ohn++)
+                        onHighlight[ohn](block, language);
                     }
 
                     // process the next block