diff --git a/src/favoritesPopover.js b/src/favoritesPopover.js
index 097c1e58..42009855 100644
--- a/src/favoritesPopover.js
+++ b/src/favoritesPopover.js
@@ -44,7 +44,7 @@ var FavoritesPopover = GObject.registerClass({
}, class FavoritesPopover extends Gtk.Popover {
_init(params) {
- params = params || { };
+ params ||= { };
this._mapView = params.mapView;
delete params.mapView;
diff --git a/src/mapView.js b/src/mapView.js
index fef736c2..ad92d2bd 100644
--- a/src/mapView.js
+++ b/src/mapView.js
@@ -481,7 +481,7 @@ var MapView = GObject.registerClass({
totalFileSizeMB += file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_SIZE,
0, null).get_size();
});
- totalFileSizeMB = totalFileSizeMB / (1024 * 1024);
+ totalFileSizeMB /= 1024 * 1024;
if (totalFileSizeMB > FILE_SIZE_LIMIT_MB) {
confirmLoad = true;
}
diff --git a/src/overpass.js b/src/overpass.js
index 2265f24c..0fe3a220 100644
--- a/src/overpass.js
+++ b/src/overpass.js
@@ -48,7 +48,7 @@ var Overpass = GObject.registerClass({
}, class Overpass extends GObject.Object {
_init(params) {
- params = params || { };
+ params ||= { };
super._init();
diff --git a/src/route.js b/src/route.js
index 0ef127fc..ff34476b 100644
--- a/src/route.js
+++ b/src/route.js
@@ -76,7 +76,7 @@ var Route = GObject.registerClass({
this.turnPoints = turnPoints;
this.distance = distance;
this.time = time;
- this.bbox = bbox || this.createBBox(path);
+ this.bbox ||= this.createBBox(path);
this.emit('update');
}
diff --git a/src/serviceBackend.js b/src/serviceBackend.js
index edcfdebe..9cc80d8a 100644
--- a/src/serviceBackend.js
+++ b/src/serviceBackend.js
@@ -55,8 +55,8 @@ var ServiceBackend = GObject.registerClass({
getCallResultMessage(restCall, parsedPayload) { }
callAsync(authorizer, method, func, params, callback, cancellable, mustRefreshToken) {
- mustRefreshToken = mustRefreshToken || true;
- cancellable = cancellable || null;
+ mustRefreshToken ||= true;
+ cancellable ||= null;
let restCall = this.createRestCall(authorizer);
@@ -97,7 +97,7 @@ var ServiceBackend = GObject.registerClass({
}
performCheckIn(authorizer, checkIn, callback, cancellable) {
- callback = callback || function() {};
+ callback ||= function() {};
this._realPerformCheckIn(authorizer, checkIn, callback, cancellable);
}
@@ -105,7 +105,7 @@ var ServiceBackend = GObject.registerClass({
_realPerformCheckIn(authorizer, checkIn, callback, cancellable) { }
findPlaces(authorizer, latitude, longitude, distance, callback, cancellable) {
- callback = callback || function() {};
+ callback ||= function() {};
this._realFindPlaces(authorizer,
latitude,
longitude,
diff --git a/src/togeojson/togeojson.js b/src/togeojson/togeojson.js
index ee99627f..ed23662a 100644
--- a/src/togeojson/togeojson.js
+++ b/src/togeojson/togeojson.js
@@ -109,7 +109,7 @@ var toGeoJSON = (function() {
}
function kmlColor(v) {
var color, opacity;
- v = v || '';
+ v ||= '';
if (v.substr(0, 1) === '#') { v = v.substr(1); }
if (v.length === 6 || v.length === 3) { color = v; }
if (v.length === 8) {
diff --git a/src/transitPlan.js b/src/transitPlan.js
index b6556e0f..5530c66b 100644
--- a/src/transitPlan.js
+++ b/src/transitPlan.js
@@ -333,7 +333,7 @@ class Itinerary extends GObject.Object {
let hours = Math.floor(mins / 60);
let hourStr = Utils.formatLocaleInteger(hours);
- mins = mins % 60;
+ mins %= 60;
if (mins === 0) {
/* translators: this is an indication for a trip duration,
diff --git a/src/utils.js b/src/utils.js
index 9c8ec3fd..b414bde4 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -336,9 +336,9 @@ function formatLocaleIntegerMinimumTwoDigits(n) {
function prettyTime(time) {
let seconds = Math.floor(time / 1000);
let minutes = Math.floor(seconds / 60);
- seconds = seconds % 60;
+ seconds %= 60;
let hours = Math.floor(minutes / 60);
- minutes = minutes % 60;
+ minutes %= 60;
let secondsStr = formatLocaleInteger(seconds);
let minutesStr = formatLocaleInteger(minutes);
diff --git a/src/xmldom/dom.js b/src/xmldom/dom.js
index 0ec86d14..1b9ec196 100644
--- a/src/xmldom/dom.js
+++ b/src/xmldom/dom.js
@@ -77,7 +77,7 @@ function DOMException(code, message) {
if(Error.captureStackTrace) Error.captureStackTrace(this, DOMException);
}
error.code = code;
- if(message) this.message = this.message + ": " + message;
+ if(message) this.message += ": " + message;
return error;
};
DOMException.prototype = Error.prototype;
diff --git a/src/xmldom/domparser.js b/src/xmldom/domparser.js
index 10bc45bc..cf8fed0a 100644
--- a/src/xmldom/domparser.js
+++ b/src/xmldom/domparser.js
@@ -2,7 +2,7 @@ const XMLReader = imports.xmldom.sax.XMLReader;
const DOMImplementation = imports.xmldom.dom.DOMImplementation;
function DOMParser(options){
- this.options = options ||{locator:{}};
+ this.options ||= {locator:{}};
}
DOMParser.prototype.parseFromString = function(source,mimeType){
var options = this.options;
@@ -23,7 +23,7 @@ DOMParser.prototype.parseFromString = function(source,mimeType){
entityMap.copy = '\xa9';
defaultNSMap['']= 'http://www.w3.org/1999/xhtml';
}
- defaultNSMap.xml = defaultNSMap.xml || 'http://www.w3.org/XML/1998/namespace';
+ defaultNSMap.xml ||= 'http://www.w3.org/XML/1998/namespace';
if(source){
sax.parse(source,defaultNSMap,entityMap);
}else{
@@ -40,7 +40,7 @@ function buildErrorHandler(errorImpl,domBuilder,locator){
}
var errorHandler = {}
var isCallback = errorImpl instanceof Function;
- locator = locator||{}
+ locator ||= {}
function build(key){
var fn = errorImpl[key];
if(!fn && isCallback){