From a3b74bade096328470e733024e67e22203d79a88 Mon Sep 17 00:00:00 2001
From: tairli <tairli@yahoo.com>
Date: Fri, 22 Apr 2022 15:16:23 +0930
Subject: [PATCH 1/5] Feature/allow control of other scripts (#1)

* Allow control of non-ScriptTag scripts
* Added display of non-Apps scripts
---
 App Optimization/app-optimization.liquid | 56 +++++++++++++++++++++---
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/App Optimization/app-optimization.liquid b/App Optimization/app-optimization.liquid
index 8b0ead2..21426e1 100644
--- a/App Optimization/app-optimization.liquid	
+++ b/App Optimization/app-optimization.liquid	
@@ -13,16 +13,22 @@
 
   for block in section.blocks
     assign url = block.settings.url | replace: '/', '\/'
+    
+    if content_for_header contains url or block.settings.not_an_app
+      assign header_checked = true
+    else
+      assign header_checked = true
+    endif 
 
-    if block.settings[block_key] == true and content_for_header contains url
+    if block.settings[block_key] == true and header_checked
       assign arr_block = block | concat: arr_block
     endif
 
-    if block.settings[scroll_key] == true and content_for_header contains url
+    if block.settings[scroll_key] == true and header_checked
       assign arr_scroll = block | concat: arr_scroll
     endif
 
-    if block.settings[interaction_key] == true and content_for_header contains url
+    if block.settings[interaction_key] == true and header_checked
       assign arr_interaction = block | concat: arr_interaction
     endif
   endfor
@@ -200,7 +206,8 @@
 {%- comment -%}
   The code below will be loaded only in the Theme Editor
 {%- endcomment-%}
-{%- assign urls = content_for_header | split: 'var urls =' | last | split: 'for (var i = 0' | first | remove: ';' | split: ',' -%}
+{%- assign urls = content_for_header | split: 'var urls =' | last | split: 'for (var i = 0' | first | remove: ';'  -%}
+{%- assign urls_array = urls | split: ',' -%}
 
 <template id="sd-app-list-template">
   <style>  
@@ -373,7 +380,7 @@
           </tr>
         </thead>
         <tbody>
-        {%- for url in urls -%}
+        {%- for url in urls_array -%}
           {%- liquid
             assign name = 'App name'
             assign load = 'Default'
@@ -411,6 +418,39 @@
             <td class="text-right"><p data-badge="{{ load }}">{{ load }}</p></td>
           </tr>
         {%- endfor -%}
+        {%- capture custom_scripts -%}
+          {%- assign urls = urls | replace: '\/', '/'  -%}            
+          {%- for block in section.blocks -%}
+            {%- unless urls contains block.settings.url -%}
+              {%- liquid 
+                if block.settings[block_key] == true
+                  assign load = 'Block'
+                elsif block.settings[scroll_key] == true
+                  assign load = 'Scroll'
+                elsif block.settings[interaction_key] == true
+                  assign load = 'Interaction'
+                endif
+              -%}
+              <tr>
+                <td><p>{{ block.settings.title }}</p></td>
+                <td>
+                  <p class="flex whitespace-no-wrap">
+                    {{ block.settings.url }}
+                  </p>
+                </td>
+                <td class="text-right"><p data-badge="{{ load }}">{{ load }}</p></td>
+              </tr>                     
+            {%- endunless -%}
+          {%- endfor -%}
+        {%- endcapture -%}
+        {%- unless custom_scripts == blank %}
+          <tr>
+            <td>
+              <h4 class="mb-4">Non-App scripts</h4>
+            </td>
+          </tr>
+          {{ custom_scripts }}
+        {% endunless %}
         </tbody>
       </table>
     </div>
@@ -517,6 +557,12 @@
             "placeholder": "e.g. shopifycdn.com/assets/v4/spr.js",
             "info": "Use partial URL, e.g: shopifycdn.com/assets/v4/spr.js"
           },
+          {
+            "type": "checkbox",
+            "id":   "not_an_app",
+            "label":  "This is not a main App script",
+            "info":   "Allows control of scripts which are not direrctly loaded via Scrip Tags"
+          },
           {
             "type": "header",
             "content": "Block script from loading"

From 482e400c525ad88ee2942afc1a206c8c1a042865 Mon Sep 17 00:00:00 2001
From: tairli <tairli@yahoo.com>
Date: Fri, 22 Apr 2022 15:23:16 +0930
Subject: [PATCH 2/5] typo fixed

---
 App Optimization/app-optimization.liquid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/App Optimization/app-optimization.liquid b/App Optimization/app-optimization.liquid
index 21426e1..06dc3fc 100644
--- a/App Optimization/app-optimization.liquid	
+++ b/App Optimization/app-optimization.liquid	
@@ -17,7 +17,7 @@
     if content_for_header contains url or block.settings.not_an_app
       assign header_checked = true
     else
-      assign header_checked = true
+      assign header_checked = false
     endif 
 
     if block.settings[block_key] == true and header_checked

From 6030fb1068ec86f42f000ab7982e0e15b3d5afe9 Mon Sep 17 00:00:00 2001
From: tairli <tairli@yahoo.com>
Date: Fri, 22 Apr 2022 15:29:37 +0930
Subject: [PATCH 3/5] Further code optimization

---
 App Optimization/app-optimization.liquid | 27 +++++++++++-------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/App Optimization/app-optimization.liquid b/App Optimization/app-optimization.liquid
index 06dc3fc..3697934 100644
--- a/App Optimization/app-optimization.liquid	
+++ b/App Optimization/app-optimization.liquid	
@@ -14,23 +14,20 @@
   for block in section.blocks
     assign url = block.settings.url | replace: '/', '\/'
     
-    if content_for_header contains url or block.settings.not_an_app
-      assign header_checked = true
-    else
-      assign header_checked = false
+    if content_for_header contains url or block.settings.not_an_app 
+      if block.settings[block_key] == true and header_checked
+        assign arr_block = block | concat: arr_block
+      endif
+  
+      if block.settings[scroll_key] == true and header_checked
+        assign arr_scroll = block | concat: arr_scroll
+      endif
+  
+      if block.settings[interaction_key] == true and header_checked
+        assign arr_interaction = block | concat: arr_interaction
+      endif
     endif 
 
-    if block.settings[block_key] == true and header_checked
-      assign arr_block = block | concat: arr_block
-    endif
-
-    if block.settings[scroll_key] == true and header_checked
-      assign arr_scroll = block | concat: arr_scroll
-    endif
-
-    if block.settings[interaction_key] == true and header_checked
-      assign arr_interaction = block | concat: arr_interaction
-    endif
   endfor
 
   assign settings_data = arr_block | concat: arr_scroll | concat: arr_interaction | uniq | map: 'settings'

From f1837e39c2a893b058c7fe5d009ea48e06569ec5 Mon Sep 17 00:00:00 2001
From: tairli <tairli@yahoo.com>
Date: Fri, 22 Apr 2022 15:30:57 +0930
Subject: [PATCH 4/5] Optimized liduid code

---
 App Optimization/app-optimization.liquid | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/App Optimization/app-optimization.liquid b/App Optimization/app-optimization.liquid
index 3697934..ef31d2d 100644
--- a/App Optimization/app-optimization.liquid	
+++ b/App Optimization/app-optimization.liquid	
@@ -15,15 +15,15 @@
     assign url = block.settings.url | replace: '/', '\/'
     
     if content_for_header contains url or block.settings.not_an_app 
-      if block.settings[block_key] == true and header_checked
+      if block.settings[block_key] == true 
         assign arr_block = block | concat: arr_block
       endif
   
-      if block.settings[scroll_key] == true and header_checked
+      if block.settings[scroll_key] == true 
         assign arr_scroll = block | concat: arr_scroll
       endif
   
-      if block.settings[interaction_key] == true and header_checked
+      if block.settings[interaction_key] == true 
         assign arr_interaction = block | concat: arr_interaction
       endif
     endif 

From 4bf9662cc8cf71f60d9d51e7186299f7d24dbaeb Mon Sep 17 00:00:00 2001
From: tairli <tairli@yahoo.com>
Date: Fri, 22 Apr 2022 15:44:59 +0930
Subject: [PATCH 5/5] Better display of non-Apps script

---
 App Optimization/app-optimization.liquid | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/App Optimization/app-optimization.liquid b/App Optimization/app-optimization.liquid
index ef31d2d..4b1cd0f 100644
--- a/App Optimization/app-optimization.liquid	
+++ b/App Optimization/app-optimization.liquid	
@@ -420,12 +420,15 @@
           {%- for block in section.blocks -%}
             {%- unless urls contains block.settings.url -%}
               {%- liquid 
-                if block.settings[block_key] == true
-                  assign load = 'Block'
-                elsif block.settings[scroll_key] == true
-                  assign load = 'Scroll'
-                elsif block.settings[interaction_key] == true
-                  assign load = 'Interaction'
+                assign load='Default'
+                if block.settings.not_an_app
+                  if block.settings[block_key] == true
+                    assign load = 'Block'
+                  elsif block.settings[scroll_key] == true
+                    assign load = 'Scroll'
+                  elsif block.settings[interaction_key] == true
+                    assign load = 'Interaction'
+                  endif
                 endif
               -%}
               <tr>