[gnome-sound-recorder] [Bug 790682] Fix scoping error caused by depreceted "let" keywork
- From: Margaret Ford <megford src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sound-recorder] [Bug 790682] Fix scoping error caused by depreceted "let" keywork
- Date: Sun, 21 Jan 2018 21:39:25 +0000 (UTC)
commit 4614a91eb9aac0f798527247e38c6febf714c05e
Author: Meg Ford <megford gnome org>
Date: Sat Jan 20 21:10:47 2018 -0600
[Bug 790682] Fix scoping error caused by depreceted "let" keywork
src/listview.js | 13 ++++---------
src/mainWindow.js | 8 ++++----
src/record.js | 12 ++++++------
src/waveform.js | 11 ++++++++---
4 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/listview.js b/src/listview.js
index 6fc106d..33cbec0 100644
--- a/src/listview.js
+++ b/src/listview.js
@@ -60,7 +60,7 @@ let fileInfo = null;
let listType = null;
let startRecording = false;
let stopVal = null;
-let trackNumber = 0;
+var trackNumber = 0;
const Listview = new Lang.Class({
Name: "Listview",
@@ -74,15 +74,8 @@ const Listview = new Lang.Class({
},
monitorListview: function() {
- try {
this.dirMonitor = this._saveDir.monitor_directory(Gio.FileMonitorFlags.WATCH_MOVES, null);
this.dirMonitor.connect('changed', this._onDirChanged);
- } catch(e) {
- log(e);
- /* Workaround for Debian and Tails not recognizing Gio.FileMointor.WATCH_MOVES */
- this.dirMonitor = this._saveDir.monitor_directory(Gio.FileMonitorFlags.NONE, null);
- this.dirMonitor.connect('changed', this._onDirChangedDeb);
- }
},
enumerateDirectory: function() {
@@ -117,7 +110,9 @@ const Listview = new Lang.Class({
let returnedNumber = parseInt(returnedName.split(" ")[1]);
if (returnedNumber > trackNumber)
trackNumber = returnedNumber;
+
} catch (e if e instanceof TypeError) {
+ log("Tracknumber not returned");
// Don't handle the error
}
let finalFileName = GLib.build_filenamev([this._saveDir.get_path(),
@@ -212,7 +207,7 @@ const Listview = new Lang.Class({
_onDiscovererFinished: function(res, info, err) {
this.result = res;
if (this.result == GstPbutils.DiscovererResult.OK && allFilesInfo[this.idx]) {
- this.tagInfo = info.get_tags(info);
+ this.tagInfo = info.get_tags();
let appString = "";
appString = this.tagInfo.get_value_index(Gst.TAG_APPLICATION_NAME, 0);
let dateTimeTag = this.tagInfo.get_date_time('datetime')[1];
diff --git a/src/mainWindow.js b/src/mainWindow.js
index ac8c5ab..9657bc5 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -57,7 +57,7 @@ let setVisibleID = null;
let UpperBoundVal = 182;
let view = null;
let volumeValue = [];
-let wave = null;
+var wave = null;
const rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
@@ -365,7 +365,7 @@ const MainView = new Lang.Class({
this._scrolledWin.get_style_context().add_class('emptyGrid');
this._addEmptyPage();
} else {
- this.listBox = Gtk.ListBox.new({ vexpand: true });
+ this.listBox = new Gtk.ListBox({ vexpand: true });
this._scrolledWin.add(this.listBox);
this.listBox.set_selection_mode(Gtk.SelectionMode.SINGLE);
this.listBox.set_header_func(null);
@@ -390,7 +390,7 @@ const MainView = new Lang.Class({
this.rowGrid.show();
// play button
- this.playImage = Gtk.Image.new({ name: "PlayImage" });
+ this.playImage = new Gtk.Image({ name: "PlayImage" });
this.playImage.set_from_icon_name(rtl ? 'media-playback-start-rtl-symbolic' :
'media-playback-start-symbolic',
Gtk.IconSize.BUTTON);
@@ -815,7 +815,7 @@ const RecordButton = new Lang.Class({
audioProfile.profile(activeProfile);
view._record.startRecording(activeProfile);
- wave = new Waveform.WaveForm(view.recordGrid);
+ wave = new Waveform.WaveForm(view.recordGrid, null);
}
});
diff --git a/src/record.js b/src/record.js
index f54427a..cf86718 100644
--- a/src/record.js
+++ b/src/record.js
@@ -238,6 +238,7 @@ const Record = new Lang.Class({
this._showErrorDialog(errorOne, errorTwo);
errorDialogState = ErrState.ON;
+ break;
}
let s = message.get_structure();
@@ -354,16 +355,15 @@ const BuildFileName = new Lang.Class({
Name: "BuildFileName",
buildInitialFilename: function() {
- let fileExtensionName = MainWindow.audioProfile.fileExtensionReturner();
- let dir = Gio.Application.get_default().saveDir;
+ var fileExtensionName = MainWindow.audioProfile.fileExtensionReturner();
+ var dir = Gio.Application.get_default().saveDir;
this.dateTime = GLib.DateTime.new_now_local();
- this.clipNumber = Listview.trackNumber + 1;
- this.clipNumberString = this.clipNumber.toString();
+ var clipNumber = Listview.trackNumber + 1;
/* Translators: ""Clip %d"" is the default name assigned to a file created
by the application (for example, "Clip 1"). */
- let clipName = _("Clip %d").format(this.clipNumberString);
+ var clipName = _("Clip %d").format(clipNumber.toString());
this.clip = dir.get_child_for_display_name(clipName);
- let file = this.clip.get_path();
+ var file = this.clip.get_path();
return file;
},
diff --git a/src/waveform.js b/src/waveform.js
index 6067522..49e3e85 100644
--- a/src/waveform.js
+++ b/src/waveform.js
@@ -245,9 +245,10 @@ const WaveForm = new Lang.Class({
if (peaks.length < this.recordTime) {
log("error");
+ return true;
}
-
- this.drawing.queue_draw();
+ if (this.drawing)
+ this.drawing.queue_draw();
}
return true;
},
@@ -258,6 +259,10 @@ const WaveForm = new Lang.Class({
this.count = 0;
peaks.length = 0;
- this.drawing.destroy();
+ try {
+ this.drawing.destroy();
+ } catch (e) {
+ log(e);
+ }
}
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]