Changeset 31104

Timestamp:

Apr 24, 2015, 10:27:59 PM (10 years ago)

Author:

mistic100

Message:

Merged revision(s) 31080 from trunk:
invalid js in SwitchBox

Location:

branches/2.7/themes/default

Files:

• js/switchbox.js (modified) (1 diff)
• template/index.tpl (modified) (3 diffs)
• template/picture.tpl (modified) (2 diffs)

branches/2.7/themes/default/js/switchbox.js

@@ -18 +18 @@
         }
 
-        SwitchBox = {
+        window.SwitchBox = {
                 push: sbFunc
         }

branches/2.7/themes/default/template/index.tpl

@@ -27 +27 @@
                         {/foreach}
                 </div>
-                {footer_script}(SwitchBox=window.SwitchBox||[]).push("#sortOrderLink", "#sortOrderBox");{/footer_script}
+                {footer_script}(window.SwitchBox=window.SwitchBox||[]).push("#sortOrderLink", "#sortOrderBox");{/footer_script}
                 {/strip}</li>
 {/if}
@@ -44 +44 @@
                         {/foreach}
                 </div>
-                {footer_script}(SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");{/footer_script}
+                {footer_script}(window.SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");{/footer_script}
                 {/strip}</li>
 {/if}
@@ -110 +110 @@
                 {/foreach}
         </div>
-        {footer_script}(SwitchBox=window.SwitchBox||[]).push("#calendarViewSwitchLink", "#calendarViewSwitchBox");{/footer_script}
+        {footer_script}(window.SwitchBox=window.SwitchBox||[]).push("#calendarViewSwitchLink", "#calendarViewSwitchBox");{/footer_script}
 </div>
 {/if}

branches/2.7/themes/default/template/picture.tpl

@@ -35 +35 @@
         document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
 }
-(SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");
+(window.SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox");
 {/literal}{/footer_script}
 {strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
@@ -294 +294 @@
         );
 }
-(SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
+(window.SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
 {/strip}{/footer_script}
                         <div id="privacyLevelBox" class="switchBox" style="display:none">