Commit 20006d42 authored by Joel Collins's avatar Joel Collins
Browse files

Merge remote-tracking branch 'origin/master' into frame

parents 4363e872 6d924c92

src/components/appContent.vue

+11 −14
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
    <calibrationModal

      ref="calibrationModal"

      :available-plugins="plugins"

      @onClose="enterApp()"

    ></calibrationModal>

    <!-- Vertical tab bar -->

    <div
@@ -209,17 +210,12 @@ export default { 
        return getters.ready;

      },

      ready => {

        if (ready) {

          // Update plugins

          this.updatePlugins().then(() => {

            // Start initialisation modals

            this.startModals();

          });



        if (ready) {

          console.log("Left panel now ready");

        } else {

          console.log("Right panel now disabled");

          this.currentTab = "connect";

        }

      }

    );
@@ -230,10 +226,6 @@ export default { 
    this.$root.$on("globalSwitchTab", tabID => {

      this.currentTab = tabID;

    });

    // A global signal listener to the first primary tab

    this.$root.$on("globalSwitchTabPrimary", () => {

      this.currentTab = "view";

    });

  },



  beforeDestroy() {
@@ -264,6 +256,11 @@ export default { 
    },

    startModals: function() {

      this.$refs["calibrationModal"].show();

    },

    enterApp: function() {

      // Stuff to do once connected and all init modals are finished

      console.log("Entering main application");

      this.currentTab = "view";

    }

  }

};

src/components/modalComponents/calibrationModal.vue

+12 −1
Original line number Diff line number Diff line
@@ -231,6 +231,10 @@ export default { 
    }

  },



  mounted() {

    this.$refs["calibrationModalEl"].addEventListener("hidden", this.onHide);

  },



  methods: {

    show: function() {

      // Get current settings
@@ -240,13 +244,15 @@ export default { 
        })

        .then(() => {

          // Check if this calibration wizard can actually do anything useful

          console.log(this.isUseful);

          if (this.isUseful) {

            this.ready = true;

            this.stepValue = 0;

            // Show the modal

            var el = this.$refs["calibrationModalEl"];

            this.showModalElement(el); // Calls the mixin

          } else {

            // If not useful, we just return the onClose event immediately

            this.onHide();

          }

        });

    },
@@ -258,6 +264,11 @@ export default { 
      this.ready = false;

    },



    onHide: function() {

      console.log("UIKit modal hidden");

      this.$emit("onClose");

    },



    getSettings: function() {

      return axios

        .get(this.settingsUri)