Updates

app/assets/templates/frontend/directives/component-modal.html.haml

@@ -1,7 +1,9 @@
-.sn-component
-  .panel{"ng-attr-id" => "component-{{component.uuid}}"}
-    .header
-      %h1.title {{component.name}}
-      %a.close-button.info{"ng-click" => "dismiss()"} Close
-    .modal-iframe-container{"ng-attr-id" => "component-{{component.uuid}}"}
-      %iframe{"ng-src" => "{{url() | trusted}}", "frameBorder" => "0", "sandbox" => "allow-scripts allow-top-navigation-by-user-activation allow-popups allow-popups-to-escape-sandbox allow-modals", "data-component-id" => "{{component.uuid}}"}
+.background{"ng-click" => "dismiss()"}
+
+.content
+  .sn-component
+    .panel{"ng-attr-id" => "component-{{component.uuid}}"}
+      .header
+        %h1.title {{component.name}}
+        %a.close-button.info{"ng-click" => "dismiss()"} Close
+      %component-view.component-view{"component" => "component"}

app/assets/templates/frontend/directives/component-view.html.haml

@@ -1,6 +1,6 @@
 %iframe{"ng-if" => "component",
 "ng-attr-id" => "component-{{component.uuid}}",
-"ng-src" => "{{url() | trusted}}", "frameBorder" => "0",
+"ng-src" => "{{component.computedUrl() | trusted}}", "frameBorder" => "0",
 "sandbox" => "allow-scripts allow-top-navigation-by-user-activation allow-popups allow-popups-to-escape-sandbox allow-modals",
 "data-component-id" => "{{component.uuid}}"}
   Loading

app/assets/templates/frontend/directives/global-extensions-menu.html.haml

@@ -24,8 +24,8 @@
             %h3
               %input.bold{"ng-if" => "theme.rename", "ng-model" => "theme.tempName", "ng-keyup" => "$event.keyCode == 13 && submitExtensionRename(theme);", "mb-autofocus" => "true", "should-focus" => "true"}
               %span{"ng-if" => "!theme.rename"} {{theme.name}}
-            %a{"ng-if" => "!themeManager.isThemeActive(theme)", "ng-click" => "themeManager.activateTheme(theme); $event.stopPropagation();"} Activate
-            %a{"ng-if" => "themeManager.isThemeActive(theme)", "ng-click" => "themeManager.deactivateTheme(theme); $event.stopPropagation();"} Deactivate
+            -# %a{"ng-if" => "!themeManager.isThemeActive(theme)", "ng-click" => "themeManager.activateTheme(theme); $event.stopPropagation();"} Activate
+            -# %a{"ng-if" => "themeManager.isThemeActive(theme)", "ng-click" => "themeManager.deactivateTheme(theme); $event.stopPropagation();"} Deactivate
             .mt-3{"ng-if" => "theme.showDetails"}
               .link-group
                 %a{"ng-click" => "renameExtension(theme); $event.stopPropagation();"} Rename

app/assets/templates/frontend/directives/permissions-modal.html.haml

@@ -5,7 +5,7 @@
     .panel
       .header
         %h1.title Activate Extension
-        %a.close-button.info Cancel
+        %a.close-button.info{"ng-click" => "deny()"} Cancel
       .content
         .panel-section
           .panel-row
@@ -14,7 +14,6 @@
               would like to interact with your
               %span{"ng-repeat" => "permission in formattedPermissions"}
                 {{permission}}.
-            -# %p.wrap URL: {{component.runningUrl}}
 
           .panel-row
             %p