bam

pgbovine · pgbovine · commit 04dc96c00df1 · 2016-07-23T21:58:28.000-07:00
diff --git a/v5-unity/composingprograms.html b/v5-unity/composingprograms.html
@@ -12,10 +12,6 @@
 
   <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
 
-<script type="text/javascript">
-window.optOverride = {}
-</script>
-
   <!-- let Webpack take care of everything. Use the [hash] feature to
        create unique filenames for releases:
        https://webpack.github.io/docs/long-term-caching.html -->
diff --git a/v5-unity/js/composingprograms.ts b/v5-unity/js/composingprograms.ts
@@ -19,6 +19,7 @@ var optFrontend: OptFrontend;
 // augment with a "Create test cases" pane
 export class OptFrontendComposingprograms extends OptFrontendSharedSessions {
   constructor(params={}) {
+    params.disableLocalStorageToggles = true;
     super(params);
     this.originFrontendJsFile = 'composingprograms.js';
   }
@@ -32,7 +33,5 @@ $(document).ready(function() {
 
   optFrontend = new OptFrontendComposingprograms();
   optFrontend.setSurveyHTML();
-
-  $('#pythonVersionSelector').change(optFrontend.setAceMode.bind(optFrontend));
   optFrontend.setAceMode();
 });
diff --git a/v5-unity/js/opt-frontend-common.ts b/v5-unity/js/opt-frontend-common.ts
@@ -100,6 +100,22 @@ export abstract class AbstractBaseFrontend {
   abstract handleUncaughtException(trace: any[]) : any; // called by executeCodeAndCreateViz
 
   constructor(params: any = {}) {
+    // OMG nasty wtf?!?
+    // From: http://stackoverflow.com/questions/21159301/quotaexceedederror-dom-exception-22-an-attempt-was-made-to-add-something-to-st
+    // Safari, in Private Browsing Mode, looks like it supports localStorage but all calls to setItem
+    // throw QuotaExceededError. We're going to detect this and just silently drop any calls to setItem
+    // to avoid the entire page breaking, without having to do a check at each usage of Storage.
+    if (typeof localStorage === 'object') {
+      try {
+        localStorage.setItem('localStorage', '1');
+        localStorage.removeItem('localStorage');
+      } catch (e) {
+        (Storage as any).prototype._setItem = Storage.prototype.setItem;
+        Storage.prototype.setItem = function() {}; // make it a NOP
+        alert('Your web browser does not support storing settings locally. In Safari, the most common cause of this is using "Private Browsing Mode". Some features may not work properly for you.');
+      }
+    }
+
     if (supports_html5_storage()) {
       // generate a unique UUID per "user" (as indicated by a single browser
       // instance on a user's machine, which can be more precise than IP
diff --git a/v5-unity/js/opt-frontend.ts b/v5-unity/js/opt-frontend.ts
@@ -117,30 +117,11 @@ export class OptFrontend extends AbstractBaseFrontend {
       $('#urlOutput').val(urlStr);
     });
 
-    // OMG nasty wtf?!?
-    // From: http://stackoverflow.com/questions/21159301/quotaexceedederror-dom-exception-22-an-attempt-was-made-to-add-something-to-st
-    // Safari, in Private Browsing Mode, looks like it supports localStorage but all calls to setItem
-    // throw QuotaExceededError. We're going to detect this and just silently drop any calls to setItem
-    // to avoid the entire page breaking, without having to do a check at each usage of Storage.
-    if (typeof localStorage === 'object') {
-      try {
-        localStorage.setItem('localStorage', '1');
-        localStorage.removeItem('localStorage');
-      } catch (e) {
-        (Storage as any).prototype._setItem = Storage.prototype.setItem;
-        Storage.prototype.setItem = function() {}; // make it a NOP
-        alert('Your web browser does not support storing settings locally. In Safari, the most common cause of this is using "Private Browsing Mode". Some features may not work properly for you.');
-      }
-    }
 
     // first initialize options from HTML LocalStorage. very important
     // that this code runs FIRST so that options get overridden by query
     // string options and anything else the user wants to override with.
-    //
-    // super hacky using window.optOverride global -- if that's in
-    // effect, then don't load/save from HTML5 storage so that we don't
-    // mess up the overridden settings
-    if (supports_html5_storage() && typeof (window as any).optOverride === 'undefined') {
+    if (supports_html5_storage() && !params.disableLocalStorageToggles) {
       var lsKeys = ['cumulative',
                     'heapPrimitives',
                     'py',
diff --git a/v5-unity/js/visualize.ts b/v5-unity/js/visualize.ts
@@ -146,9 +146,12 @@ $(document).ready(function() {
   $("#exampleSnippets")
     .append(exampleHeaderHtml);
 
+  var params = {};
   var optOverride = (window as any).optOverride;
   // super hacky!
   if (optOverride) {
+    (params as any).disableLocalStorageToggles = true;
+
     if (optOverride.frontendLang === 'java') {
       $("#exampleSnippets").append(javaExamplesHtml);
     } else if (optOverride.frontendLang === 'js') {
@@ -175,7 +178,7 @@ $(document).ready(function() {
   $("#footer").append(footerHtml);
 
 
-  optFrontend = new OptFrontendWithTestcases();
+  optFrontend = new OptFrontendWithTestcases(params);
   optFrontend.setSurveyHTML();
 
   // canned examples
