Merge pull request GoogleChrome#302 from beaufortfrancois/mergeWarnings

web-bluetooth: move flag check into utils.html
akkovachev · Feb 23, 2016 · 55a8f14 · 55a8f14
2 parents 7ef098a + 5cd2fa3
commit 55a8f14
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 42 deletions.
diff --git a/web-bluetooth/_includes/utils.html b/web-bluetooth/_includes/utils.html
@@ -0,0 +1,13 @@
+<script>
+  log = ChromeSamples.log;
+
+  function isWebBluetoothEnabled() {
+    if (navigator.bluetooth) {
+      return true;
+    } else {
+      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
+                              'Please make sure the Web Bluetooth flag is enabled.');
+      return false;
+    }
+  }
+</script>
diff --git a/web-bluetooth/battery-level.html b/web-bluetooth/battery-level.html
@@ -5,6 +5,7 @@
 ---
 
 {% include_relative _includes/intro.html %}
+{% include_relative _includes/utils.html %}
 
 <p>This sample illustrates the use of the Web Bluetooth API to retrieve battery
 information from a nearby Bluetooth Device advertising Battery information with
@@ -21,13 +22,9 @@
 
 <script>
   document.querySelector('button').addEventListener('click', function() {
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       ChromeSamples.clearLog();
       onButtonClick();
     }
   });
-  log = ChromeSamples.log;
 </script>
diff --git a/web-bluetooth/characteristic-properties.html b/web-bluetooth/characteristic-properties.html
@@ -5,6 +5,7 @@
 ---
 
 {% include_relative _includes/intro.html %}
+{% include_relative _includes/utils.html %}
 
 <p>This sample illustrates the use of the Web Bluetooth API to display all
 properties of a specific characteristic from a nearby Bluetooth Low Energy
@@ -31,13 +32,9 @@
     event.stopPropagation();
     event.preventDefault();
 
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       ChromeSamples.clearLog();
       onFormSubmit();
     }
   });
-  log = ChromeSamples.log;
 </script>
diff --git a/web-bluetooth/device-disconnect.html b/web-bluetooth/device-disconnect.html
@@ -5,6 +5,7 @@
 ---
 
 {% include_relative _includes/intro.html %}
+{% include_relative _includes/utils.html %}
 
 <p>This sample illustrates the use of the Web Bluetooth API to <a href="http://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothgattremoteserver-disconnect">disconnect</a> and get notified from a disconnection of a nearby Bluetooth Low Energy Device after connecting to it.</p>
 
@@ -28,10 +29,7 @@
     event.stopPropagation();
     event.preventDefault();
 
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       ChromeSamples.clearLog();
       onScanButtonClick();
     }
@@ -40,23 +38,16 @@
     event.stopPropagation();
     event.preventDefault();
 
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       onDisconnectButtonClick();
     }
   });
   document.querySelector('#reconnect').addEventListener('click', function(event) {
     event.stopPropagation();
     event.preventDefault();
 
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       onReconnectButtonClick();
     }
   });
-  log = ChromeSamples.log;
 </script>
diff --git a/web-bluetooth/device-info.html b/web-bluetooth/device-info.html
@@ -5,6 +5,7 @@
 ---
 
 {% include_relative _includes/intro.html %}
+{% include_relative _includes/utils.html %}
 
 <p>This sample illustrates the use of the Web Bluetooth API to retrieve basic
 device information from a nearby Bluetooth Low Energy Device.</p>
@@ -27,13 +28,9 @@
     event.stopPropagation();
     event.preventDefault();
 
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       ChromeSamples.clearLog();
       onFormSubmit();
     }
   });
-  log = ChromeSamples.log;
 </script>
diff --git a/web-bluetooth/notifications.html b/web-bluetooth/notifications.html
@@ -5,6 +5,7 @@
 ---
 
 {% include_relative _includes/intro.html %}
+{% include_relative _includes/utils.html %}
 
 <p>This sample illustrates the use of the Web Bluetooth API to start and stop
 characteristic notifications from a nearby Bluetooth Low Energy Device. You may
@@ -32,10 +33,7 @@
     event.stopPropagation();
     event.preventDefault();
 
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       ChromeSamples.clearLog();
       onStartButtonClick();
     }
@@ -44,12 +42,8 @@
     event.stopPropagation();
     event.preventDefault();
 
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       onStopButtonClick();
     }
   });
-  log = ChromeSamples.log;
 </script>
diff --git a/web-bluetooth/reset-energy.html b/web-bluetooth/reset-energy.html
@@ -5,6 +5,7 @@
 ---
 
 {% include_relative _includes/intro.html %}
+{% include_relative _includes/utils.html %}
 
 <p>This sample illustrates the use of the Web Bluetooth API to reset energy
 expended from a nearby Bluetooth Device advertising Heart Rate with Bluetooth
@@ -21,13 +22,9 @@
 
 <script>
   document.querySelector('button').addEventListener('click', function() {
-    if (!navigator.bluetooth) {
-      ChromeSamples.setStatus('Web Bluetooth API is not available.\n' +
-        'Please make sure the Web Bluetooth flag is enabled.');
-    } else {
+    if (isWebBluetoothEnabled()) {
       ChromeSamples.clearLog();
       onButtonClick();
     }
   });
-  log = ChromeSamples.log;
 </script>