Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
- use Object.assign instead of Object.keys().forEach
- loadSettings() no longer necessary
- double quoting no longer necessary
  • Loading branch information
Ditto-IV100 committed Mar 21, 2018
1 parent 6f02394 commit b81bb26
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
20 changes: 6 additions & 14 deletions static/js/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,21 +163,13 @@ function downloadSettings(name, settings) { // eslint-disable-line no-unused-var
document.body.removeChild(a)
}

function loadSettings(e) {
var t = JSON.parse(JSON.parse(e))
Object.keys(t).forEach(function (e) {
localStorage.setItem(e, t[e])
})
window.location.reload()
}

function openSettingsFile(file) { // eslint-disable-line no-unused-vars
var fr = new FileReader()
fr.onload = function () {
console.log(fr.result)
loadSettings(fr.result)
function loadSettingsFile(file) { // eslint-disable-line no-unused-vars
var reader = new FileReader()
reader.onload = function () {
Object.assign(localStorage, JSON.parse(reader.result))
}
fr.readAsText(file.target.files[0])
reader.readAsText(file.target.files[0])
window.location.reload()
}

function initMap() { // eslint-disable-line no-unused-vars
Expand Down
4 changes: 2 additions & 2 deletions templates/map.html
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ <h3>Location Icon Marker</h3>
</div>
</div>
<div>
<center><button class="settings" onclick="downloadSettings('RocketMap', JSON.stringify(JSON.stringify(localStorage)))"><i class="fa fa-upload fa-fw"></i>Export Settings</button></center>
<center><input id="fileInput" type="file" style="display:none;" onchange="openSettingsFile(event)"> <button class="settings" onclick="document.getElementById('fileInput').click()"><i class="fa fa-download fa-fw"></i>Import Settings</button></center>
<center><button class="settings" onclick="downloadSettings('RocketMap', JSON.stringify(localStorage))"><i class="fa fa-upload fa-fw"></i>Export Settings</button></center>
<center><input id="settingsFileInput" type="file" style="display:none;" onchange="loadSettingsFile(event)"> <button class="settings" onclick="document.getElementById('settingsFileInput').click()"><i class="fa fa-download fa-fw"></i>Import Settings</button></center>
<center><button class="settings" onclick="confirm('Are you sure you want to reset settings to default values?') ? (localStorage.clear(), window.location.reload()) : false"><i class="fa fa-refresh fa-fw"></i>Reset Settings</button></center>
</div>
</nav>
Expand Down

0 comments on commit b81bb26

Please sign in to comment.