Permalink
Browse files

Make loading client-options.json asynchronous

  • Loading branch information...
1 parent 0ee3cf2 commit 7ea75df3ee914ecdf9954b3a680e77eee4f94a68 @mattgodbolt committed Jan 9, 2017
Showing with 38 additions and 2 deletions.
  1. +36 −0 static/async-get.js
  2. +2 −2 static/options.js
View
@@ -0,0 +1,36 @@
+// Copyright (c) 2012-2017, Matt Godbolt
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+define({
+ load: function (name, req, onLoad, config) {
+ if (config.isBuild) return onLoad(null); // optimizer build
+
+ req(['jquery'], function ($) {
+ $.ajax({type: "GET", url: name}).done(function (response) {
+ onLoad(response);
+ });
+ });
+ }
+});
View
@@ -25,8 +25,8 @@
define(function (require) {
"use strict";
- var $ = require('jquery');
- var options = $.ajax({type: "GET", url: 'client-options.json', async: false}).responseJSON;
+ var options = require('./async-get!client-options.json');
options.embedded = window.location.pathname === "/embed.html";
return options;
});
+

0 comments on commit 7ea75df

Please sign in to comment.