Merge branch 'master' into release

hAr1x · hAr1x · commit d12804dd2fd1 · 2017-11-16T01:06:54.000-06:00
diff --git a/.jshintrc b/.jshintrc
@@ -1,33 +1,20 @@
-{ "globals":
-  { "geofs": true
-  , "controls": true
-  , "METERS_TO_FEET": true
-  , "PAGE_PATH": true
-  , "autopilot_pp": true
-  , "componentHandler": true
-  , "google": true
-  , "ui": true
-  , "define": true
-  , "require": true
-  , "requirejs": true
-  , "Promise": true
-  }
+{ "globals": { "module": true }
+, "node": true
+, "predef": [ "-Promise" ]
+, "varstmt": true
+, "esnext": 6
 , "laxcomma": true
 , "laxbreak": true
 , "multistr": true
 , "eqeqeq": true
 , "smarttabs": true
-, "globalstrict": true
-, "jquery": true
 , "curly": false
-, "browser": true
 , "expr": true
 , "devel": true
 , "debug": true
-, "funcscope": true
+, "funcscope": false
 , "unused": true
 , "bitwise": true
-, "-W079": false
 , "-W058": false
 , "-W002": false
 , "-W004": false
diff --git a/compile/.jshintrc b/compile/.jshintrc
diff --git a/source/.jshintrc b/source/.jshintrc
@@ -0,0 +1,31 @@
+{ "globals":
+  { "geofs": true
+  , "controls": true
+  , "METERS_TO_FEET": true
+  , "PAGE_PATH": true
+  , "autopilot_pp": true
+  , "componentHandler": true
+  , "google": true
+  , "ui": true
+  , "define": true
+  , "require": true
+  , "requirejs": true
+  , "Promise": true
+  }
+, "laxcomma": true
+, "laxbreak": true
+, "multistr": true
+, "eqeqeq": true
+, "smarttabs": true
+, "globalstrict": true
+, "jquery": true
+, "curly": false
+, "browser": true
+, "expr": true
+, "devel": true
+, "debug": true
+, "funcscope": false
+, "unused": true
+, "bitwise": true
+, "-W004": false
+}
diff --git a/source/html/modal.html b/source/html/modal.html
@@ -56,8 +56,8 @@ <h4><strong>Flight Management Computer</strong></h4>
             <i class="material-icons">add</i>
         </button>
         <div class="fmc-auto-tod-container interactive arr-tab">
-            <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="auto-tod" data-bind="css: {'is-checked': todCalc}">
-                <input type="checkbox" id="auto-tod" class="mdl-switch__input" data-bind="checked: todCalc">
+            <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="auto-tod">
+                <input type="checkbox" id="auto-tod" class="mdl-switch__input" data-bind="checked: todCalc, mdlSwitch: true">
                 <span class="mdl-switch__label">Automatically Calculate T/D</span>
             </label>
         </div>
diff --git a/source/html/tab-contents/dep-arr.html b/source/html/tab-contents/dep-arr.html
@@ -7,8 +7,8 @@
                     <!-- T/D dist -->
                     <td>
                         <span class="fmc-dep-arr__input-label">T/D Dist.</span>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label tod-dist-container" data-bind="css: {'is-dirty': todDist}">
-                            <input class="mdl-textfield__input tod-dist" type="number" data-bind="value: todDist" pattern="\d*">
+                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label tod-dist-container">
+                            <input class="mdl-textfield__input tod-dist" type="number" data-bind="value: todDist, mdlTextfield: true" pattern="\d*">
                             <label class="mdl-textfield__label">Nautical Miles (nm)</label>
                             <span class="mdl-textfield__error">Invalid T/D Distance</span>
                         </div>
@@ -17,8 +17,8 @@
                     <!-- Field elevation -->
                     <td>
                         <span class="fmc-dep-arr__input-label">Arrival Field Elev.</span>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" data-bind="css: {'is-dirty': fieldElev}">
-                            <input class="mdl-textfield__input field-elev" type="number" data-bind="value: fieldElev" pattern="-?\d*">
+                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                            <input class="mdl-textfield__input field-elev" type="number" data-bind="value: fieldElev, mdlTextfield: true" pattern="-?\d*">
                             <label class="mdl-textfield__label">Feet (ft.)</label>
                             <span class="mdl-textfield__error">Invalid Field Elevation</span>
                         </div>
diff --git a/source/html/tab-contents/load.html b/source/html/tab-contents/load.html
@@ -8,17 +8,17 @@
                 <span>Waypoints / Route</span>
                 <i class="material-icons">mode_edit</i>
             </div>
-            <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" data-bind="css:{'is-dirty':loadRouteText}">
-                <input class="mdl-textfield__input load-wpt" data-bind="value: loadRouteText">
+            <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                <input class="mdl-textfield__input load-wpt" data-bind="value: loadRouteText, mdlTextfield: true">
                 <label class="mdl-textfield__label">Enter waypoints separated by spaces or a generated route</label>
             </div>
             <button class="mdl-button mdl-js-button mdl-button--icon load-wpt" data-bind="click: loadRoute">
                 <i class="material-icons">keyboard_return</i>
             </button>
 
             <!-- Generate Route -->
-            <div class="mdl-textfield mdl-js-textfield fmc-generate-rte-container" data-bind="css:{'is-dirty':generateRoute}">
-                <textarea class="mdl-textfield__input generate-rte" readonly rows="6" maxrows="6" data-bind="value: generateRoute"></textarea>
+            <div class="mdl-textfield mdl-js-textfield fmc-generate-rte-container">
+                <textarea class="mdl-textfield__input generate-rte" readonly rows="6" maxrows="6" data-bind="value: generateRoute, mdlTextfield: true"></textarea>
                 <label class="mdl-textfield__label">Generated Route</label>
             </div>
         </div>
diff --git a/source/html/tab-contents/route.html b/source/html/tab-contents/route.html
@@ -9,24 +9,24 @@
                     <!-- Departure input -->
                     <td>
                         <i class="material-icons">flight_takeoff</i>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" data-bind="css:{'is-dirty':departureAirport}">
-                            <input class="mdl-textfield__input dep" data-bind="value: departureAirport">
+                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                            <input class="mdl-textfield__input dep" data-bind="value: departureAirport, mdlTextfield: true">
                             <label class="mdl-textfield__label">Departure</label>
                         </div>
                     </td>
                     <!-- Arrival input -->
                     <td>
                         <i class="material-icons">flight_land</i>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" data-bind="css:{'is-dirty':arrivalAirport}">
-                            <input class="mdl-textfield__input arr" data-bind="value: arrivalAirport">
+                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                            <input class="mdl-textfield__input arr" data-bind="value: arrivalAirport, mdlTextfield: true">
                             <label class="mdl-textfield__label">Arrival</label>
                         </div>
                     </td>
                     <!-- Flight num input -->
                     <td>
                         <i class="material-icons">local_airport</i>
-                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" data-bind="css:{'is-dirty':flightNumber}">
-                            <input class="mdl-textfield__input fn" data-bind="value: flightNumber">
+                        <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                            <input class="mdl-textfield__input fn" data-bind="value: flightNumber, mdlTextfield: true">
                             <label class="mdl-textfield__label">Flight #</label>
                         </div>
                     </td>
@@ -56,31 +56,31 @@
                         <td>
                             <!-- Waypoint input -->
                             <span class="fmc-wpt-info" data-bind="text: info"></span>
-                            <div class="mdl-textfield mdl-js-textfield" data-bind="css:{'is-dirty':wpt}">
-                                <input class="mdl-textfield__input wpt" data-bind="value: wpt">
+                            <div class="mdl-textfield mdl-js-textfield">
+                                <input class="mdl-textfield__input wpt" data-bind="value: wpt, mdlTextfield: true">
                                 <label class="mdl-textfield__label">Fix, VOR, ICAO</label>
                             </div>
                         </td>
                         <td>
                             <!-- Latitude input -->
-                            <div class="mdl-textfield mdl-js-textfield" data-bind="css:{'is-dirty':lat}">
-                                <input class="mdl-textfield__input lat" data-bind="value: lat" pattern="-?(\d*(\.\d+)?|\d*\s\d+(\.\d+)?)">
+                            <div class="mdl-textfield mdl-js-textfield">
+                                <input class="mdl-textfield__input lat" data-bind="value: lat, mdlTextfield: true" pattern="-?(\d*(\.\d+)?|\d*\s\d+(\.\d+)?)">
                                 <label class="mdl-textfield__label">Lat.</label>
                                 <span class="mdl-textfield__error">Invalid Latitude</span>
                             </div>
                         </td>
                         <td>
                             <!-- Longitude input -->
-                            <div class="mdl-textfield mdl-js-textfield" data-bind="css:{'is-dirty':lon}">
-                                <input class="mdl-textfield__input lon" data-bind="value: lon" pattern="-?(\d*(\.\d+)?|\d*\s\d+(\.\d+)?)">
+                            <div class="mdl-textfield mdl-js-textfield">
+                                <input class="mdl-textfield__input lon" data-bind="value: lon, mdlTextfield: true" pattern="-?(\d*(\.\d+)?|\d*\s\d+(\.\d+)?)">
                                 <label class="mdl-textfield__label">Lon.</label>
                                 <span class="mdl-textfield__error">Invalid Longitude</span>
                             </div>
                         </td>
                         <td>
                             <!-- Altitude input -->
-                            <div class="mdl-textfield mdl-js-textfield" data-bind="css:{'is-dirty':alt}">
-                                <input class="mdl-textfield__input alt" type="number" max=3280000 step=10 data-bind="value: alt">
+                            <div class="mdl-textfield mdl-js-textfield">
+                                <input class="mdl-textfield__input alt" type="number" max=3280000 step=10 data-bind="value: alt, mdlTextfield: true">
                                 <label class="mdl-textfield__label">Ft.</label>
                                 <span class="mdl-textfield__error">Invalid Altitude</span>
                             </div>
diff --git a/source/html/tab-contents/vnav.html b/source/html/tab-contents/vnav.html
@@ -9,14 +9,14 @@
                     <td>
                         <div class="fmc-vnav-toggle-container">
                             <div>
-                                <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="vnav-toggle" data-bind="css: {'is-checked': vnavEnabled, 'is-disabled': cruiseAlt() == undefined}">
-                                    <input type="checkbox" id="vnav-toggle" class="mdl-switch__input" data-bind="checked: vnavEnabled, disable: cruiseAlt() == undefined">
+                                <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="vnav-toggle">
+                                    <input type="checkbox" id="vnav-toggle" class="mdl-switch__input" data-bind="checked: vnavEnabled, disable: cruiseAlt() == undefined, mdlSwitch: true">
                                     <span class="mdl-switch__label">VNAV</span>
                                 </label>
                                 <i class="material-icons">unfold_more_horizontal</i>
                             </div>
-                            <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" data-bind="css: {'is-dirty': cruiseAlt() != undefined}">
-                                <input class="mdl-textfield__input cruise-alt" type="number" data-bind="value: cruiseAlt" pattern="\d*">
+                            <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                                <input class="mdl-textfield__input cruise-alt" type="number" data-bind="value: cruiseAlt, mdlTextfield: true" pattern="\d*">
                                 <label class="mdl-textfield__label">Cruise Altitude (ft.)</label>
                                 <span class="mdl-textfield__error">Invalid Cruise Altitude</span>
                             </div>
@@ -26,8 +26,8 @@
                     <!-- Speed control -->
                     <td>
                         <div class="fmc-spd-toggle-container">
-                            <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="spd-toggle" data-bind="css: {'is-checked': spdControl}">
-                                <input type="checkbox" id="spd-toggle" class="mdl-switch__input" data-bind="checked: spdControl">
+                            <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="spd-toggle">
+                                <input type="checkbox" id="spd-toggle" class="mdl-switch__input" data-bind="checked: spdControl, mdlSwitch: true">
                                 <span class="mdl-switch__label">SPD Control</span>
                             </label>
                         </div>
diff --git a/source/init.js b/source/init.js
@@ -10,7 +10,7 @@
 
 	if (!window.Promise) throw new Error('Browser is outdated.');
 
-	var VALID_VERSION = 'v0.10.6';
+	var VALID_VERSION = 'v0.11.0';
 
 	// Error if FMC is loaded without Autopilot++ or with outdated Autopilot++
 	function errorNotCompatible () {
@@ -34,7 +34,8 @@
 
 	// Check if game has completed loading
 	var timer = setInterval(function () {
-		if (!(window.geofs && geofs.aircraft &&
+		if (!(window.google && google.maps &&
+			window.geofs && geofs.aircraft &&
 			geofs.aircraft.instance &&
 			geofs.aircraft.instance.object3d)) return;
 
diff --git a/source/nav/VNAV.js b/source/nav/VNAV.js
@@ -211,9 +211,9 @@ define([
 	 * @returns {Object} The profile needed by VNAV
 	 */
 	function getVNAVProfile () {
-		return geofs.aircraft.instance.setup.fmc
-			|| vnavProfile[geofs.aircraft.instance.id]
-			|| vnavProfile.DEFAULT;
+		return geofs.aircraft.instance.setup.fmc ||
+			vnavProfile[geofs.aircraft.instance.id] ||
+			vnavProfile.DEFAULT;
 	}
 
 	/**
diff --git a/source/nav/progress.js b/source/nav/progress.js
@@ -72,7 +72,8 @@ define([
 		} else flightDist = Math.round(flightDist);
 
 		// If T/D is entered and T/D has not been passed
-		if (flight.todDist() && flight.todDist() < flightDist) var todDist = flightDist - flight.todDist();
+		var todDist;
+		if (flight.todDist() && flight.todDist() < flightDist) todDist = flightDist - flight.todDist();
 
 		// Formats nextDist
 		if (nextDist < 10) {
diff --git a/source/ui/ViewModel.js b/source/ui/ViewModel.js
@@ -14,7 +14,7 @@ define(['knockout', 'flight', 'get', 'log', 'waypoints', 'nav/progress'], functi
         var _opened = ko.observable(false);
         self.opened = ko.pureComputed({
             read: _opened,
-            write: function (boolean, viewmodel) { // jshint unused:false
+            write: function (boolean, _vm) { // jshint ignore:line
                 _opened(boolean);
             }
         });
@@ -136,7 +136,7 @@ define(['knockout', 'flight', 'get', 'log', 'waypoints', 'nav/progress'], functi
         var generatedRouteText = ko.observable();
         self.generateRoute = ko.pureComputed({
             read: generatedRouteText,
-            write: function (isGenerate, viewmodel) { // jshint unused:false
+            write: function (isGenerate, _vm) { // jshint ignore:line
                 var generatedRoute = isGenerate ? waypoints.toRouteString() : undefined;
                 generatedRouteText(generatedRoute);
             }
@@ -150,5 +150,44 @@ define(['knockout', 'flight', 'get', 'log', 'waypoints', 'nav/progress'], functi
 
     }
 
+    /**
+     * Handles CSS of MDL switch buttons
+     */
+    ko.bindingHandlers.mdlSwitch = {
+        update: function (element, _unused, bindings) { // jshint ignore:line
+            // Listens for 'checked' binding
+            var isChecked = bindings.get('checked');
+            if (isChecked) isChecked();
+
+            // Listens for 'disable' binding
+            bindings.get('disable');
+
+            var materialSwitch = element.parentNode.MaterialSwitch;
+            if (!materialSwitch) return;
+
+            materialSwitch.checkDisabled();
+            materialSwitch.checkToggleState();
+        }
+    };
+
+    /**
+     * Handles CSS of MDL textfields
+     */
+    ko.bindingHandlers.mdlTextfield = {
+        update: function (element, _unused, bindings) { // jshint ignore:line
+            // Listens for 'value' binding
+            var hasValue = bindings.get('value');
+            if (hasValue) hasValue();
+
+            var materialTextfield = element.parentNode.MaterialTextfield;
+            if (!materialTextfield) return;
+
+            materialTextfield.checkDirty();
+            materialTextfield.checkDisabled();
+            materialTextfield.checkFocus();
+            materialTextfield.checkValidity();
+        }
+    };
+
     return ViewModel;
 });
diff --git a/source/userscript.js b/source/userscript.js
@@ -5,6 +5,6 @@
 // @namespace GeoFS-Plugins
 // @match http://*/geofs.php*
 // @run-at document-end
-// @version 0.5.4
+// @version 0.5.5
 // @grant none
 // ==/UserScript==
diff --git a/testing/index.js b/testing/index.js
@@ -1,4 +1,3 @@
-/* jshint node:true, varstmt:true, esversion:6 */
 "use strict";
 
 const heads = require('robohydra').heads;
diff --git a/testing/script.js b/testing/script.js
@@ -1,3 +1,4 @@
+/* jshint browser:true, jquery:true */
 "use strict";
 
 window.addEventListener('deferredload', function () {
