From f981de8e614f43974063eb4ffcc378281f934725 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Fri, 6 Jan 2017 13:10:42 +0000 Subject: [PATCH 1/6] Use editor.hasFile instead of storage.exists --- src/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app.js b/src/app.js index 909f2d3619..68113642e3 100644 --- a/src/app.js +++ b/src/app.js @@ -209,7 +209,7 @@ var run = function () { var fileList = $('input.inputFile')[0].files for (var i = 0; i < fileList.length; i++) { var name = fileList[i].name - if (!storage.exists(utils.fileKey(name)) || confirm('The file ' + name + ' already exists! Would you like to overwrite it?')) { + if (!editor.hasFile(name) || confirm('The file ' + name + ' already exists! Would you like to overwrite it?')) { editor.uploadFile(fileList[i], updateFiles) } } @@ -241,7 +241,7 @@ var run = function () { $fileNameInputEl.off('keyup') if (newName !== originalName && confirm( - storage.exists(utils.fileKey(newName)) + editor.hasFile(newName) ? 'Are you sure you want to overwrite: ' + newName + ' with ' + originalName + '?' : 'Are you sure you want to rename: ' + originalName + ' to ' + newName + '?')) { storage.rename(utils.fileKey(originalName), utils.fileKey(newName)) From 4d1eeae9ba518a9ae9fd50aeffabc936afba35a7 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 9 Jan 2017 03:19:21 +0000 Subject: [PATCH 2/6] Merge fileTabTemplate into sole caller --- src/app.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app.js b/src/app.js index 68113642e3..d331d7acc9 100644 --- a/src/app.js +++ b/src/app.js @@ -293,7 +293,8 @@ var run = function () { $('#output').empty() for (var f in files) { - $filesEl.append(fileTabTemplate(files[f])) + var name = utils.fileNameFromKey(files[f]) + $filesEl.append($('
  • ' + name + '
    • ')) } if (editor.cacheFileIsPresent()) { @@ -306,11 +307,6 @@ var run = function () { reAdjust() } - function fileTabTemplate (key) { - var name = utils.fileNameFromKey(key) - return $('
  • ' + name + '
    • ') - } - var $filesWrapper = $('.files-wrapper') var $scrollerRight = $('.scroller-right') var $scrollerLeft = $('.scroller-left') From 944a586380dca36dee92759c5e660da60f53a120 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 11 Jan 2017 10:13:13 +0000 Subject: [PATCH 3/6] Remove unused storage.getFileContent --- src/app/storage.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/app/storage.js b/src/app/storage.js index e457087d2a..f8c054802f 100644 --- a/src/app/storage.js +++ b/src/app/storage.js @@ -1,7 +1,5 @@ 'use strict' -var utils = require('./utils') - function Storage () { this.rename = function (originalName, newName) { var content = this.get(originalName) @@ -13,10 +11,6 @@ function Storage () { window.localStorage.removeItem(name) } - this.getFileContent = function (key) { - return this.get(utils.fileKey(key)) - } - this.exists = function (key) { return !!this.get(key) } From 705d465a01b1acc86a42789ba50969718c7924e1 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 11 Jan 2017 19:59:49 +0000 Subject: [PATCH 4/6] Reorder storage.js --- src/app/storage.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/storage.js b/src/app/storage.js index f8c054802f..fb9250d258 100644 --- a/src/app/storage.js +++ b/src/app/storage.js @@ -1,33 +1,33 @@ 'use strict' function Storage () { - this.rename = function (originalName, newName) { - var content = this.get(originalName) - this.set(newName, content) - this.remove(originalName) - } - - this.remove = function (name) { - window.localStorage.removeItem(name) - } - this.exists = function (key) { return !!this.get(key) } - this.set = function (key, content) { - window.localStorage.setItem(key, content) - } - this.get = function (key) { return window.localStorage.getItem(key) } + this.set = function (key, content) { + window.localStorage.setItem(key, content) + } + this.keys = function () { // NOTE: this is a workaround for some browsers return Object.keys(window.localStorage).filter(function (item) { return item !== null && item !== undefined }) } + this.remove = function (name) { + window.localStorage.removeItem(name) + } + + this.rename = function (originalName, newName) { + var content = this.get(originalName) + this.set(newName, content) + this.remove(originalName) + } + this.loadFile = function (filename, content) { if (this.exists(filename) && this.get(filename) !== content) { var count = '' From b4446dcd4ac036acb4a8c2d67059d90030534b47 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 11 Jan 2017 20:00:37 +0000 Subject: [PATCH 5/6] Use consistent naming in storage --- src/app/storage.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/storage.js b/src/app/storage.js index fb9250d258..0bcc71c83a 100644 --- a/src/app/storage.js +++ b/src/app/storage.js @@ -1,16 +1,16 @@ 'use strict' function Storage () { - this.exists = function (key) { - return !!this.get(key) + this.exists = function (name) { + return !!this.get(name) } - this.get = function (key) { - return window.localStorage.getItem(key) + this.get = function (name) { + return window.localStorage.getItem(name) } - this.set = function (key, content) { - window.localStorage.setItem(key, content) + this.set = function (name, content) { + window.localStorage.setItem(name, content) } this.keys = function () { From 3ae6b4370452e7b5e381a06f12cf3401cd51d0fd Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 11 Jan 2017 23:04:01 +0000 Subject: [PATCH 6/6] Merge activeFileTab into sole caller --- src/app.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app.js b/src/app.js index d331d7acc9..aee5672e66 100644 --- a/src/app.js +++ b/src/app.js @@ -280,11 +280,6 @@ var run = function () { return false } - function activeFileTab () { - var name = utils.fileNameFromKey(editor.getCacheFile()) - return $('#files .file').filter(function () { return $(this).find('.name').text() === name }) - } - function updateFiles () { var $filesEl = $('#files') var files = editor.getFiles() @@ -298,7 +293,8 @@ var run = function () { } if (editor.cacheFileIsPresent()) { - var active = activeFileTab() + var currentFileName = utils.fileNameFromKey(editor.getCacheFile()) + var active = $('#files .file').filter(function () { return $(this).find('.name').text() === currentFileName }) active.addClass('active') editor.resetSession() }