[gjs: 3/4] examples/calc: Update coding style

[Philip Chimento <pchimento src gnome org>]

commit 9f95480b52991788a550fca99143275868a3ac29
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Apr 24 00:25:22 2018 +0000

    examples/calc: Update coding style

 examples/calc.js | 159 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 80 insertions(+), 79 deletions(-)
---
diff --git a/examples/calc.js b/examples/calc.js
index 34c9bcb4..7ec6a353 100644
--- a/examples/calc.js
+++ b/examples/calc.js
@@ -1,133 +1,134 @@
 #!/usr/bin/env gjs
 
-var Gdk = imports.gi.Gdk;
-var Gtk = imports.gi.Gtk;
-var GLib = imports.gi.GLib;
+imports.gi.versions.Gtk = '3.0';
+const {Gtk} = imports.gi;
 
 Gtk.init(null);
 
-var calc_val = "";
+var calc_val = '';
 
-function update_display(){
-    label.set_markup("<span size='30000'>" + calc_val + "</span>");
+function update_display() {
+    label.set_markup(`<span size='30000'>${calc_val}</span>`);
 
-    if(calc_val === ""){
-       label.set_markup("<span size='30000'>0</span>");
+    if(calc_val === '') {
+        label.set_markup("<span size='30000'>0</span>");
     }
 }
 
-function clear(button){
-    calc_val = "";
+function clear() {
+    calc_val = '';
     update_display();
 }
 
-function backspace(button){
+function backspace() {
     calc_val = calc_val.substring(0, calc_val.length - 1);
     update_display();
 }
 
-function pressed_equals(button){
-    calc_val = calc_val.replace("sin", "Math.sin");
-    calc_val = calc_val.replace("cos", "Math.cos");
-    calc_val = calc_val.replace("tan", "Math.tan");
+function pressed_equals() {
+    calc_val = calc_val.replace('sin', 'Math.sin');
+    calc_val = calc_val.replace('cos', 'Math.cos');
+    calc_val = calc_val.replace('tan', 'Math.tan');
     calc_val = eval(calc_val);
-    // Avoid rediculous amounts of precision from toString.
+    // Avoid ridiculous amounts of precision from toString.
     if (calc_val == Math.floor(calc_val))
-       calc_val = Math.floor(calc_val);
-    else // bizzarely gjs loses str.toFixed() somehow?!
-       calc_val = Math.floor(calc_val*10000)/10000;
-    label.set_markup("<span size='30000'>" + calc_val + "</span>");
+        calc_val = Math.floor(calc_val);
+    else // bizarrely gjs loses str.toFixed() somehow?!
+        calc_val = Math.floor(calc_val * 10000) / 10000;
+    label.set_markup(`<span size='30000'>${calc_val}</span>`);
 }
 
-function pressed_operator(button){
+function pressed_operator(button) {
     calc_val += button.label;
     update_display();
 }
 
-function pressed_number(button){
-    calc_val = (((calc_val === 0) ? "" : calc_val) + button.label);
+function pressed_number(button) {
+    calc_val = (((calc_val === 0) ? '' : calc_val) + button.label);
     update_display();
 }
 
-function swap_sign(button){
-    calc_val = ((calc_val[0] == "-") ?
-               calc_val.substring(1) : "-" + calc_val);
+function swap_sign() {
+    calc_val = ((calc_val[0] == '-') ?
+        calc_val.substring(1) : '-' + calc_val);
     update_display();
 }
 
-function random_num(){
-    calc_val = Math.floor(Math.random() * 1000) + "";
+function random_num() {
+    calc_val = Math.floor(Math.random() * 1000) + '';
     update_display();
 }
 
-function pack_buttons(buttons, vbox){
+function pack_buttons(buttons, vbox) {
     var hbox = new Gtk.HBox();
 
     hbox.homogeneous = true;
 
     vbox.pack_start(hbox, true, true, 2);
 
-    for(let i = 0; i <= 4; i++){
-       hbox.pack_start(buttons[i], true, true, 1);
+    for(let i = 0; i <= 4; i++) {
+        hbox.pack_start(buttons[i], true, true, 1);
     }
 }
 
-function create_button(str, func){
-    var btn = new Gtk.Button({label:str});
-    btn.connect("clicked",func);
+function create_button(str, func) {
+    var btn = new Gtk.Button({label: str});
+    btn.connect('clicked', func);
     return btn;
 }
 
-function create_buttons(){
-    var vbox = new Gtk.VBox();
-
-    vbox.homogeneous = true;
-
-    pack_buttons([     create_button("(", pressed_number),
-                       create_button("←", backspace),
-                       create_button("↻", random_num),
-                       create_button("Clr", clear),
-                       create_button("±", swap_sign)], vbox);
-
-
-    pack_buttons([     create_button(")", pressed_number),
-                       create_button("7", pressed_number),
-                       create_button("8", pressed_number),
-                       create_button("9", pressed_number),
-                       create_button("/", pressed_operator)], vbox);
-
-    pack_buttons([     create_button("sin(", pressed_number),
-                       create_button("4", pressed_number),
-                       create_button("5", pressed_number),
-                       create_button("6", pressed_number),
-                       create_button("*", pressed_operator)], vbox);
-
-    pack_buttons([     create_button("cos(", pressed_number),
-                       create_button("1", pressed_number),
-                       create_button("2", pressed_number),
-                       create_button("3", pressed_number),
-                       create_button("-", pressed_operator)], vbox);
-
-    pack_buttons([     create_button("tan(", pressed_number),
-                       create_button("0", pressed_number),
-                       create_button(".", pressed_number),
-                       create_button("=", pressed_equals),
-                       create_button("+", pressed_operator)], vbox);
+function create_buttons() {
+    var vbox = new Gtk.VBox({homogeneous: true});
+
+    pack_buttons([
+        create_button('(', pressed_number),
+        create_button('←', backspace),
+        create_button('↻', random_num),
+        create_button('Clr', clear),
+        create_button('±', swap_sign)], vbox);
+
+    pack_buttons([
+        create_button(')', pressed_number),
+        create_button('7', pressed_number),
+        create_button('8', pressed_number),
+        create_button('9', pressed_number),
+        create_button('/', pressed_operator)], vbox);
+
+    pack_buttons([
+        create_button('sin(', pressed_number),
+        create_button('4', pressed_number),
+        create_button('5', pressed_number),
+        create_button('6', pressed_number),
+        create_button('*', pressed_operator)], vbox);
+
+    pack_buttons([
+        create_button('cos(', pressed_number),
+        create_button('1', pressed_number),
+        create_button('2', pressed_number),
+        create_button('3', pressed_number),
+        create_button('-', pressed_operator)], vbox);
+
+    pack_buttons([
+        create_button('tan(', pressed_number),
+        create_button('0', pressed_number),
+        create_button('.', pressed_number),
+        create_button('=', pressed_equals),
+        create_button('+', pressed_operator)], vbox);
 
     return vbox;
 }
 
-var window = new Gtk.Window({title: "Calculator", resizable: false});
-
-window.resize(250, 250);
-window.connect("destroy", () => {
-    Gtk.main_quit();
+var win = new Gtk.Window({
+    title: 'Calculator',
+    resizable: false,
+    opacity: 0.6,
 });
 
-window.opacity = 0.6;
+win.resize(250, 250);
+win.connect('destroy', () => Gtk.main_quit());
 
-var label = new Gtk.Label({label: ""});
-label.set_alignment(1,0);
+var label = new Gtk.Label({label: ''});
+label.set_alignment(1, 0);
 update_display();
 
 var mainvbox = new Gtk.VBox();
@@ -135,6 +136,6 @@ mainvbox.pack_start(label, false, true, 1);
 mainvbox.pack_start(new Gtk.HSeparator(), false, true, 5);
 mainvbox.pack_start(create_buttons(), true, true, 2);
 
-window.add(mainvbox);
-window.show_all();
+win.add(mainvbox);
+win.show_all();
 Gtk.main();
\ No newline at end of file