From a3aaa5a74dd579215d6560feea061572703b8608 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 9 May 2016 16:44:21 -0400
Subject: [PATCH] removed some javascript, added member list for packaging
 shortcode

---
 controllers/admin.php  | 41 ++++++++++++++---------------------------
 js/shortcodeBuilder.js | 34 ++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/controllers/admin.php b/controllers/admin.php
index a0808cca..48b433ea 100644
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -442,9 +442,6 @@ class glmMembersAdmin extends GlmPluginSupport
 
         wp_enqueue_media();
 
-        wp_register_script('scBuilder', GLM_MEMBERS_PLUGIN_URL.'/js/shortcodeBuilder.js', false, GLM_MEMBERS_PLUGIN_VERSION);
-        wp_enqueue_script('scBuilder');
-        
         // Register any admin.js files in the js directory of any glm members plugin
         reset($this->config['addOns']);
         foreach ($this->config['addOns'] as $a) {
@@ -660,20 +657,13 @@ class glmMembersAdmin extends GlmPluginSupport
     }    
 //    // metabox content
         public function shortcode_builder_markup(){
-// 
-            require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php');     
-//            
+            
+            require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php');                
             $listAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-members-list']['attributes'];
             $detailAttr = $this->config['addOns']['glm-member-db']['shortcodes']['glm-member-detail']['attributes'];
-            $packageListAttr = $this->config['addOns']['glm-member-db-packaging']['shortcodes']['glm-members-packaging-list']['attributes'];
-//  
-//            foreach($packageListAttr as $key=>$value){
-//                $packageListAttr[] = $key;
-//            }
-//                   
+           
             $glmcat = new GlmDataCategories($this->wpdb, $this->wpconfig);
-            $list = $glmcat->getList();
-//      
+            $list = $glmcat->getList();   
             // get the each addOn slugs to pass to the config array later
             $addOns = $this->config['addOns'];
             foreach($addOns as $addOn){
@@ -693,8 +683,7 @@ class glmMembersAdmin extends GlmPluginSupport
                         $shortCodes[] = $shortCode;
                     }
                 }
-            }
-////            
+            }      
 //            /*
 //             * HTML Markup for the shortodes
 //             */
@@ -706,28 +695,27 @@ class glmMembersAdmin extends GlmPluginSupport
             //dropdown for shortcode names
             echo '<div id="shortcodeBuilder">';
             echo '<select id="shortcodeDropdown">
-            <option disabled="disabled"> Select Shortcode </option>';
+            <option value=""> Select Shortcode </option>';
             foreach($shortCodes as $code){
                 echo '<option value = "' . $code . '">' . $code . '</option>';
             }
             echo '</select>';
-//            
-//            
+        
 //            /*
 //             * Member DB Shortcode Attributes
 //             */
 //            
             //dropdown for categories
             echo '<select id="category-scDropdown">';
-            echo '<option disabled="disabled"> Select Category </option>';
+            echo '<option value=""> Select Category </option>';
             foreach($list as $key=>$value){
                 echo '<option value='. $key . '>' . $value['name']  . '</option>';
             }
             echo '</select>';
-//
+
 //            // dropdown for blank start
             echo '<select id="blank-start-scDropdown">';
-            echo  '<option disabled="disabled"> Blank Start </option>
+            echo  '<option value=""> Blank Start </option>
             <option selected="selected" value="False"> False </option>
             <option value = "True"> True </option>';
             echo '</select>';
@@ -742,7 +730,7 @@ class glmMembersAdmin extends GlmPluginSupport
                 }
             }           
             echo '</div>';
-//
+
             // show detail options
             echo '<div id="showDetail" title="Detail Options">';
             echo '<label><input class="detailBox" type="checkbox" name="detailBox" value="all">All</label>';
@@ -753,13 +741,12 @@ class glmMembersAdmin extends GlmPluginSupport
                 }
             }           
             echo '</div>';
-//            
-//            // packaging addOn mark up
+           
+           // packaging addOn mark up
             if(file_exists(GLM_MEMBERS_PACKAGING_PLUGIN_PATH . "/setup/shortcodeBuilder.php")){
                 include GLM_MEMBERS_PACKAGING_PLUGIN_PATH . "/setup/shortcodeBuilder.php";
             }
-//            
-//
+
             // list and detail buttons to open dialog for member db 'show' attr options
             echo '<button id="listBtn" class="glm-button" type="button"> Show List Options </button>';
             echo '<button id="detailBtn" class="glm-button" type="button"> Show Detail Options </button>';
diff --git a/js/shortcodeBuilder.js b/js/shortcodeBuilder.js
index 74493533..85dcf969 100644
--- a/js/shortcodeBuilder.js
+++ b/js/shortcodeBuilder.js
@@ -73,6 +73,7 @@ jQuery(document).ready(function ($) {
             $("#category-scDropdown").hide();
             $("#detailBtn").hide();
             $("[id^='packageList']").hide();
+             $("#id-scDropdown").hide();
         }
         if (shortcodeDropdown === "glm-members-event-detail"){
             $("#blank-start-scDropdown").hide();
@@ -80,6 +81,15 @@ jQuery(document).ready(function ($) {
             $("#category-scDropdown").hide();
             $("#detailBtn").hide();
             $("[id^='packageList']").hide();
+             $("#id-scDropdown").hide();
+        }
+        if (shortcodeDropdown === "glm-members-event-front-add"){
+            $("#blank-start-scDropdown").hide();
+            $("#listBtn").hide();
+            $("#category-scDropdown").hide();
+            $("#detailBtn").hide();
+            $("[id^='packageList']").hide();
+             $("#id-scDropdown").hide();
         }
     });
  
@@ -178,18 +188,18 @@ jQuery(document).ready(function ($) {
     var blank = document.getElementById('blank-start-scDropdown');
     var list = document.getElementById('type-scList');
     
-    if(scd){
-        window.onload = document.getElementById('shortcodeDropdown').options[0].selected = 'selected';
-    }
-    if(catscd){
-        window.onload = document.getElementById('category-scDropdown').options[0].selected = 'selected';
-    }
-    if(blank){
-        window.onload = document.getElementById('blank-start-scDropdown').options[0].selected = 'selected';
-    }
-    if(list){
-        window.onload = document.getElementById('type-scList').options[0].selected = 'selected';
-    }
+//    if(scd){
+//        window.onload = document.getElementById('shortcodeDropdown').options[0].selected = 'selected';
+//    }
+//    if(catscd){
+//        window.onload = document.getElementById('category-scDropdown').options[0].selected = 'selected';
+//    }
+//    if(blank){
+//        window.onload = document.getElementById('blank-start-scDropdown').options[0].selected = 'selected';
+//    }
+//    if(list){
+//        window.onload = document.getElementById('type-scList').options[0].selected = 'selected';
+//    }
    window.onload = UncheckAll();
      
     function UncheckAll(){ 
-- 
2.17.1