Skip to content

Commit

Permalink
preparing v0.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jackd248 committed Oct 3, 2016
1 parent c42a24a commit 944c8ae
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 24 deletions.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ <h1>
<button class="close">Close Temps</button>
</div>
<div class="footer">
<a href="https://jackd248.github.io/temps/" target="_blank" alt="temps">temps</a> - v0.5.0 &copy; 2016
<a href="https://jackd248.github.io/temps/" target="_blank" alt="temps">temps</a> - v0.5.1 &copy; 2016
</div>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "temps",
"productName": "Temps",
"website": "https://jackd248.github.io/temps/",
"version": "0.5.0",
"version": "0.5.1",
"icon": "assets/app.png",
"description": "A simple but smart menubar weather app",
"main": "app.js",
"electronVersion": "1.4.1",
"electronVersion": "1.4.2",
"keywords": [
"electron",
"temperature",
Expand Down Expand Up @@ -43,11 +43,11 @@
"electron-packager": "^8.0.0",
"electron-prebuilt": "^1.4.1",
"electron-installer-dmg": "0.1.2",
"electron-builder": "7.3.0",
"standard": "^7.1.1"
"electron-builder": "7.10.2",
"standard": "^8.3.0"
},
"dependencies": {
"electron": "1.4.1",
"electron": "1.4.2",
"menubar": "^5.1.0",
"auto-launch": "^5.0.1",
"applescript": "^1.0.0",
Expand Down
15 changes: 13 additions & 2 deletions src/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "temps",
"version": "v0.5.0",
"version": "v0.5.1",
"apikey": "547bbdc38bd641bef6645cd2c4bc613f",
"timezone": {
"url": "https://maps.googleapis.com/maps/api/timezone/json",
Expand Down Expand Up @@ -53,7 +53,18 @@
"Ulaanbaatar, MN",
"Wellington, NZ",
"Moscow, RU",
"Madrid, SP"
"Madrid, SP",
"Tirana, AL",
"Algiers, DZ",
"Andorra la Vella, AD",
"Vatican City, VA",
"Caracas, VE",
"Abu Dhabi, AE",
"Kyiv, UA",
"Kampala, UG",
"Ankara, TR",
"Tunis, TN",
""
]
}
}
32 changes: 16 additions & 16 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
var localStorage = require('localStorage')
var JsonStorage = require('json-storage').JsonStorage
var store = JsonStorage.create(localStorage, 'temps', { stringify: true })
let JsonStorage = require('json-storage').JsonStorage
let store = JsonStorage.create(localStorage, 'temps', { stringify: true })

var $, jQuery = require('jquery')
var chart = require('chart.js')
var ipcRenderer = require('electron').ipcRenderer
var CountUp = require('countup.js')
const jQuery = require('jquery')
const chart = require('chart.js')
const ipcRenderer = require('electron').ipcRenderer
const CountUp = require('countup.js')

const config = require('./src/config.json')

var wdata = {}
let wdata = {}

var color = null
var loading = [false, false, false, false]
var timeoffset = config.timezone.offset
var numAnim = null
let color = null
let loading = [false, false, false, false]
let timeoffset = config.timezone.offset
let numAnim = null

window.onload = function ()
{
Expand All @@ -25,7 +25,7 @@ window.onload = function ()
loadEventListener()
}

var loadEventListener = function () {
const loadEventListener = function () {

jQuery('#details .content').click(toggleDetails)

Expand Down Expand Up @@ -56,7 +56,7 @@ var loadEventListener = function () {
})

jQuery('input[type="checkbox"][name="favorite-city"]').change(function () {
var bool = jQuery('input[type="checkbox"][name="favorite-city"]:checked').length > 0
const bool = jQuery('input[type="checkbox"][name="favorite-city"]:checked').length > 0
if (bool) {
setFavoriteCity(jQuery('input#city').val())
} else {
Expand All @@ -65,7 +65,7 @@ var loadEventListener = function () {
})

jQuery('input[type="checkbox"][name="mb-info"]').change(function () {
var bool = jQuery('input[type="checkbox"][name="mb-info"]:checked').length > 0
const bool = jQuery('input[type="checkbox"][name="mb-info"]:checked').length > 0
setMbInfo(bool)
if (getMbInfo()) {
refreshWeather()
Expand All @@ -75,7 +75,7 @@ var loadEventListener = function () {
})

jQuery('input[type="checkbox"][name="auto-launch"]').change(function () {
var bool = jQuery('input[type="checkbox"][name="auto-launch"]:checked').length > 0
const bool = jQuery('input[type="checkbox"][name="auto-launch"]:checked').length > 0
setAutoLaunch(bool)
ipcRenderer.send('auto-launch')
})
Expand Down Expand Up @@ -124,7 +124,7 @@ var loadEventListener = function () {
ipcRenderer.on('random-city', randomCity)
}

var init = function () {
const init = function () {
if (store.get('actual-city')) {
setCity(store.get('actual-city'))
} else {
Expand Down

0 comments on commit 944c8ae

Please sign in to comment.