Changeset 1190458

Timestamp:

06/30/2015 07:02:04 PM (11 years ago)

Author:

mmtechmaster

Message:

Mid-changes. Grabbing a snapshot for safety sake.

Location:

militant-moderates-css-parent-selector-mmps/trunk

Files:

• js/mmParentSelector.js (modified) (1 diff)
• js/mmParentSelector.min.js (modified) (1 diff)
• mmParentSelector.php (modified) (3 diffs)

militant-moderates-css-parent-selector-mmps/trunk/js/mmParentSelector.js

@@ -474 +474 @@
             for ( var j=0; j < argv.length; ++j ) {
                 var pair = argv[j].split('=');
-                if ( pair[0] == 'ver' ) {
-                    pair = pair[1].split('+');
-                    if ( pair[0] != packageVersion ) {
-                    }
+                if ( pair[0] == 'inc' ) {
+//                  pair = pair[1].split('+');
+//                  if ( pair[0] != packageVersion ) {
+//                      console.log( 'Version Error! : '+ pair[1] + ' != ' + packageVersion );
+//                  }
                     if ( pair[1] ) {
                         if ( pair[1].indexOf('X') >= 0 )

militant-moderates-css-parent-selector-mmps/trunk/js/mmParentSelector.min.js

@@ -23 +23 @@
 return tem.slice(1).join(' ').replace('OPR','Opera');}
 M=M[2]?[M[1],M[2]]:[navigator.appName,navigator.appVersion,'-?'];if((tem=ua.match(/version\/(\d+)/i))!=null)M.splice(1,1,tem[1]);return{'browser':M[0],'version':M[1]};;})();if(navigator.browserInfo.browser=="MSIE"&&navigator.browserInfo.version<=8){pseudoElements={after:':after',before:':before',first_letter:':first-letter',first_line:':first-line',selection:':selection'};stateMap={active:':active',disabled:':disabled',empty:':empty',enabled:':enabled',invalid:':invalid',lang:':lang',link:':link',not:':not',optional:':optional',required:':required',target:':target',valid:':valid',visited:':visited'};}
-var parseExternal=false,parseInline=false;$('script[src*="'+packageName+'"]').each(function(){var src=$(this).attr('src').split('?');if(src[1]){var argv=src[1].split('&');for(var j=0;j<argv.length;++j){var pair=argv[j].split('=');if(pair[0]=='ver'){pair=pair[1].split('+');if(pair[0]!=packageVersion){}
-if(pair[1]){if(pair[1].indexOf('X')>=0)
+var parseExternal=false,parseInline=false;$('script[src*="'+packageName+'"]').each(function(){var src=$(this).attr('src').split('?');if(src[1]){var argv=src[1].split('&');for(var j=0;j<argv.length;++j){var pair=argv[j].split('=');if(pair[0]=='inc'){if(pair[1]){if(pair[1].indexOf('X')>=0)
 parseExternal=true;if(pair[1].indexOf('I')>=0)
 parseInline=true;}}}}});$('link[rel="stylesheet"],style').each(function(i){if($(this).attr('mmps_ignore')){}else if($(this).is('link')){var href=$(this).attr('href');if(parseExternal||href.indexOf('display_mmps_ccss=css')>=0){$.ajax({type:'GET',url:href,dataType:'text'}).done(function(css){parse(css);}).fail(function(){});}}else if(parseInline||$(this).attr('mmps_ccss')){parse($(this).text());}});});

militant-moderates-css-parent-selector-mmps/trunk/mmParentSelector.php

@@ -40 +40 @@
  *  2 = Includes all debugging and NOT minified - NOT included in distribution release
  *-------------------------------------------------------------------------------------*/
-define( 'MMPS_SCRIPT_DEV', 2 );                     // set as above: 0, 1, 2
+define( 'MMPS_SCRIPT_DEV', 0 );                     // set as above: 0, 1, 2
 define( 'MMPS_SCRIPT_VERSION', '1.2.1' );           // set to script version number as in header
 
@@ -48 +48 @@
     // pure CSS rules. Depends on jQuery.
     
-    // Here's where we get funky. The script version number is used to piggyback the option settings
-    // that control which sources of CSS will be parsed and which will be ignored.
-    $mmps_ver = '';
+    // In order to pass the parameters to the JavaScript, we must build up a parameter
+    // that will be appended to the .js file name when it is enqueued
+    $mmps_parm = '';
     $mmps_ccss = get_option('mmpsccss_settings');
     if ( isset( $mmps_ccss[ 'mmps_ccss_parse_external' ] ) )
-        $mmps_ver .= 'X';
+        $mmps_parm .= 'X';
     if ( isset( $mmps_ccss[ 'mmps_ccss_parse_inline' ] ) )
-        $mmps_ver .= 'I';
-    $mmps_ver = MMPS_SCRIPT_VERSION . ( $mmps_ver != '' ? '+' . $mmps_ver : '' );
+        $mmps_parm .= 'I';
+        
+    $mmps_parm = ( $mmps_parm != '' ? '?inc=' . $mmps_parm : '' );
+    $mmps_ver = MMPS_SCRIPT_VERSION;
 
     // If DEBUG mode is selected and the current user has capability to activate plugins ..
@@ -64 +66 @@
         // the .dev.js version is the working copy with full debugging included
         // it is NOT included in the standard distribution, so protect against attempts to use it
-        wp_enqueue_script( 'mmps_js', plugins_url( 'js/mmParentSelector.dev.js', __FILE__ ), array( 'jquery' ), $mmps_ver );
+        wp_enqueue_script( 'mmps_js', plugins_url( 'js/mmParentSelector.dev.js', __FILE__ ) . $mmps_parm, array( 'jquery' ), $mmps_ver );
 
     } elseif ( MMPS_SCRIPT_DEV != 1 ) {
         // Either in full DEBUG mode but not allowed (not an admin) or FULL version NOT specified explicitly ...
         // the .min.js version is stripped of all debugging code and minified
-        wp_enqueue_script( 'mmps_js', plugins_url( 'js/mmParentSelector.min.js', __FILE__ ), array( 'jquery' ), $mmps_ver );
+        wp_enqueue_script( 'mmps_js', plugins_url( 'js/mmParentSelector.min.js', __FILE__ ) . $mmps_parm, array( 'jquery' ), $mmps_ver );
 
     } else {
         // the .js version is stripped of debugging but is NOT minified
-        wp_enqueue_script( 'mmps_js', plugins_url( 'js/mmParentSelector.js', __FILE__ ), array( 'jquery' ), $mmps_ver );
+        wp_enqueue_script( 'mmps_js', plugins_url( 'js/mmParentSelector.js', __FILE__ ) . $mmps_parm, array( 'jquery' ), $mmps_ver );
 
     }