Changeset 740007

Timestamp:

07/12/2013 08:29:40 PM (12 years ago)

Author:

shauno

Message:

Development version for improved ajax with js magnification. requires users testing, and the premium release to get approved and out there before this is fully released

Location:

nextgen-gallery-voting/trunk

Files:

• js/ajaxify-likes.js (modified) (1 diff)
• js/ajaxify-stars.js (modified) (1 diff)
• ngg-voting.php (modified) (2 diffs)

nextgen-gallery-voting/trunk/js/ajaxify-likes.js

@@ -11 +11 @@
                 data: '',
                 success: function(data, textStatus, XMLHttpRequest) {
-                    var start = data.indexOf("<!-- NGGV START AJAX RESPONSE -->") + 41; //find the start of the outputting by the ajax url (stupid wordpress and poor buffering options blah blah)
-                    var end = data.indexOf("<script><!-- NGGV END AJAX RESPONSE -->");
-                    
-                    var js = data.substr(start, (end-start));
-                    js = js.replace(/(\r\n|\n|\r)/gm,'');
-                    
-                    eval(js); //the array of voters gets echoed out at the ajax url
+                    var ajaxVer = data.indexOf('var nggv_ajax_ver'); //bit of a hack to improve ajax with minification, but keeping backwards compat for older users
+                    if(ajaxVer > -1) { //means it was actually found, the ver num is irrelevent for now
+                        eval(data);
+                    }else{
+                        var start = data.indexOf("<!-- NGGV START AJAX RESPONSE -->") + 41; //find the start of the outputting by the ajax url (stupid wordpress and poor buffering options blah blah)
+                        var end = data.indexOf("<script><!-- NGGV END AJAX RESPONSE -->");
+                        
+                        var js = data.substr(start, (end-start));
+                        js = js.replace(/(\r\n|\n|\r)/gm,'');
+                        
+                        eval(js); //the array of voters gets echoed out at the ajax url
+                    }
                     
                     if(typeof(nggv_js) == 'object') {

nextgen-gallery-voting/trunk/js/ajaxify-stars.js

@@ -11 +11 @@
             data: '',
             success: function(data, textStatus, XMLHttpRequest) {
-                var start = data.indexOf("<!-- NGGV START AJAX RESPONSE -->") + 41; //find the start of the outputting by the ajax url (stupid wordpress and poor buffering options blah blah)
-                var end = data.indexOf("<script><!-- NGGV END AJAX RESPONSE -->");
-                
-                var js = data.substr(start, (end-start));
-                js = js.replace(/(\r\n|\n|\r)/gm,'');
-                
-                eval(js); //the array of voters gets echoed out at the ajax url
+                var ajaxVer = data.indexOf('var nggv_ajax_ver'); //bit of a hack to improve ajax with minification, but keeping backwards compat for older users
+                if(ajaxVer > -1) { //means it was actually found, the ver num is irrelevent for now
+                    eval(data);
+                }else{
+                    var start = data.indexOf("<!-- NGGV START AJAX RESPONSE -->") + 41; //find the start of the outputting by the ajax url (stupid wordpress and poor buffering options blah blah)
+                    var end = data.indexOf("<script><!-- NGGV END AJAX RESPONSE -->");
+                    
+                    var js = data.substr(start, (end-start));
+                    js = js.replace(/(\r\n|\n|\r)/gm,'');
+                    
+                    eval(js); //the array of voters gets echoed out at the ajax url
+                }
                 
                 if(typeof(nggv_js) == 'object') {

nextgen-gallery-voting/trunk/ngg-voting.php

@@ -1709 +1709 @@
                     $form = $this->getImageVoteMarkup($options);
 
-                    echo '<!-- NGGV START AJAX RESPONSE -->';
-                    echo '<script>';
+                    //echo '<!-- NGGV START AJAX RESPONSE -->';
+                    //echo '<script>';
+                    echo 'var nggv_ajax_ver = 2;'; //new in 2.6.1 to help js minification messing up ajac voting
                     echo 'var nggv_js = {};';
                     echo 'nggv_js.options = {};';
@@ -1716 +1717 @@
                     echo 'nggv_js.msg = "'.addslashes($votedOrErr).'";';
                     echo 'nggv_js.voting_form = "'.addslashes($form['form']).'";';
-                    echo '<script><!-- NGGV END AJAX RESPONSE -->';
+                    //echo '<script><!-- NGGV END AJAX RESPONSE -->';
                     exit;
                 }