fix: fix export of module in browser environment

nodeshift · Dec 22, 2016 · 5a0594c · 5a0594c
1 parent 2cc08f0
commit 5a0594c
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 47 deletions.
diff --git a/examples/jquery/app.js b/examples/jquery/app.js
@@ -2,10 +2,8 @@
 /* global $ circuitBreaker */
 
 (function appInitialization () {
-  $(() => {
-    $('#flakey').click(handleClick('/flakeyService', '#flakeyResponse'));
-    $('.clear').click(function () { $(this).siblings('p').remove(); });
-  });
+  const route = '/flakeyService';
+  const element = '#flakeyResponse';
 
   const circuitBreakerOptions = {
     timeout: 500,
@@ -14,55 +12,60 @@
     Promise: Promise
   };
 
-  function handleClick (route, element) {
-    const circuit = circuitBreaker((route, element) => {
-      circuit.fallback(() => ({ body: `${route} unavailable right now. Try later.` }));
+  const circuit = circuitBreaker((route, element) => {
+    circuit.fallback(() => ({ body: `${route} unavailable right now. Try later.` }));
 
-      // Return a promise to the circuit
-      return new Promise((resolve, reject) => {
-        $.get(route)
-          .done((data) => resolve(data))
-          .fail((err) => {
-            reject(err);
-            console.error(err);
-          });
-      });
-    }, circuitBreakerOptions);
+    // Return a promise to the circuit
+    return new Promise((resolve, reject) => {
+      $.get(route)
+        .done((data) => resolve(data))
+        .fail((err) => {
+          reject(err);
+          console.error(err);
+        });
+    });
+  }, circuitBreakerOptions);
 
-    circuit.on('success',
-      (data) => $(element).append(makeNode(`SUCCESS: ${JSON.stringify(data)}`)));
+  circuit.on('success',
+    (data) => $(element).append(makeNode(`SUCCESS: ${JSON.stringify(data)}`)));
 
-    circuit.on('timeout',
-      () => $(element).append(
-        makeNode(`TIMEOUT: ${route} is taking too long to respond.`)));
+  circuit.on('timeout',
+    () => $(element).append(
+      makeNode(`TIMEOUT: ${route} is taking too long to respond.`)));
 
-    circuit.on('reject',
-      () => $(element).append(
-        makeNode(`REJECTED: The breaker for ${route} is open. Failing fast.`)));
+  circuit.on('reject',
+    () => $(element).append(
+      makeNode(`REJECTED: The breaker for ${route} is open. Failing fast.`)));
 
-    circuit.on('open',
-      () => $(element).append(
-        makeNode(`OPEN: The breaker for ${route} just opened.`)));
+  circuit.on('open',
+    () => $(element).append(
+      makeNode(`OPEN: The breaker for ${route} just opened.`)));
 
-    circuit.on('halfOpen',
-      () => $(element).append(
-        makeNode(`HALF_OPEN: The breaker for ${route} is half open.`)));
+  circuit.on('halfOpen',
+    () => $(element).append(
+      makeNode(`HALF_OPEN: The breaker for ${route} is half open.`)));
 
-    circuit.on('close',
-      () => $(element).append(
-        makeNode(`CLOSE: The breaker for ${route} has closed. Service OK.`)));
+  circuit.on('close',
+    () => $(element).append(
+      makeNode(`CLOSE: The breaker for ${route} has closed. Service OK.`)));
 
-    circuit.on('fallback',
-      (data) => $(element).append(
-        makeNode(`FALLBACK: ${JSON.stringify(data)}`)));
-
-    return () => circuit.fire(route, element).catch((e) => console.error(e));
-  }
+  circuit.on('fallback',
+    (data) => $(element).append(
+      makeNode(`FALLBACK: ${JSON.stringify(data)}`)));
 
   function makeNode (body) {
     const response = document.createElement('p');
     $(response).addClass(body.substring(0, body.indexOf(':')).toLowerCase());
     response.append(body);
     return response;
   }
+
+  function callService () {
+    circuit.fire(route, element).catch((e) => console.error(e));
+  }
+
+  $(() => {
+    $('#flakey').click(callService);
+    $('.clear').click(function () { $(this).siblings('p').remove(); });
+  });
 })();
diff --git a/index.js b/index.js
@@ -57,16 +57,10 @@ function circuitBreaker (action, options) {
 circuitBreaker.promisify = require('./lib/promisify');
 
 function exportModule (exported) {
-  console.log('Exporting', exported);
-  console.log('Module', module);
-  if (typeof document === 'object') {
-    // in a browser environment
-    root[exported.name] = exported;
-  } else if (typeof module === 'object' && module.exports) {
+  if (typeof module === 'object' && module.exports) {
     // we're in a node.js environment
     module.exports = exports = exported;
   } else {
-    // ??
     root[exported.name] = exported;
   }
 }