Browse Source

Improved null/undefined checks

Tobias Reich 8 years ago
parent
commit
632557800c

+ 1 - 1
src/scripts/loadingBar.js

@@ -75,7 +75,7 @@ loadingBar.show = function(status, errorText) {
 
 loadingBar.hide = function(force) {
 
-	if ((loadingBar.status!=='error' && loadingBar.status!==null) || force) {
+	if ((loadingBar.status!=='error' && loadingBar.status!=null) || force) {
 
 		// Remove status
 		loadingBar.status = null

+ 5 - 5
src/scripts/lychee.js

@@ -143,7 +143,7 @@ lychee.loginDialog = function() {
 
 	if (localStorage) {
 		let localUsername = localStorage.getItem('lychee_username')
-		if (localUsername!==null && localUsername.length>0) {
+		if (localUsername!=null && localUsername.length>0) {
 			$('.basicModal input[name="username"]').val(localUsername)
 			$('.basicModal input[name="password"]').focus()
 		}
@@ -181,8 +181,8 @@ lychee.load = function() {
 	contextMenu.close()
 	multiselect.close()
 
-	if (hash[0]!==undefined) albumID = hash[0]
-	if (hash[1]!==undefined) photoID = hash[1]
+	if (hash[0]!=null) albumID = hash[0]
+	if (hash[1]!=null) photoID = hash[1]
 
 	if (albumID && photoID) {
 
@@ -212,7 +212,7 @@ lychee.load = function() {
 	} else {
 
 		// Trash albums.json when filled with search results
-		if (search.hash!==null) {
+		if (search.hash!=null) {
 			albums.json = null
 			search.hash = null
 		}
@@ -327,7 +327,7 @@ lychee.retinize = function(path = '') {
 	    extention  = path.split('.').pop(),
 	    hasRetina  = extention!=='svg'
 
-	if ((pixelRatio!==undefined && pixelRatio>1) && hasRetina===true) {
+	if ((pixelRatio!=null && pixelRatio>1) && hasRetina===true) {
 
 		path = path.replace(/\.[^/.]+$/, '')
 		path = path + '@2x' + '.' + extention

+ 1 - 1
src/scripts/multiselect.js

@@ -199,7 +199,7 @@ multiselect.getSelection = function(e) {
 
 				let id = $(this).data('id')
 
-				if (id!=='0' && id!==0 && id!=='f' && id!=='s' && id!=='r' && id!==null) {
+				if (id!=='0' && id!==0 && id!=='f' && id!=='s' && id!=='r' && id!=null) {
 
 					ids.push(id)
 					$(this).addClass('active')

+ 1 - 1
src/scripts/photo.js

@@ -659,7 +659,7 @@ photo.getSize = function() {
 	if (photo.json.width>view.width || photo.json.height>view.height) scaled = true
 
 	// Calculate pixel ratio of screen
-	if (pixelRatio!==undefined && pixelRatio>1) {
+	if (pixelRatio!=null && pixelRatio>1) {
 		view.width  = view.width * pixelRatio
 		view.height = view.height * pixelRatio
 	}

+ 1 - 1
src/scripts/search.js

@@ -85,7 +85,7 @@ search.reset = function() {
 	$('#search').val('')
 	$('.no_content').remove()
 
-	if (search.hash!==null) {
+	if (search.hash!=null) {
 
 		// Trash data
 		albums.json = null

+ 2 - 2
src/scripts/upload.js

@@ -88,7 +88,7 @@ upload.start = {
 			if (file.supported===false) {
 
 				// Skip file
-				if (file.next!==null) process(files, file.next)
+				if (file.next!=null) process(files, file.next)
 				else {
 
 					// Look for supported files
@@ -217,7 +217,7 @@ upload.start = {
 					$('.basicModal .rows .row:nth-child(' + (file.num+1) + ') .status').html('Processing')
 
 					// Upload next file
-					if (file.next!==null) process(files, file.next)
+					if (file.next!=null) process(files, file.next)
 
 				}
 

+ 1 - 1
src/scripts/view.js

@@ -62,7 +62,7 @@ view.albums = {
 			}
 
 			// Restore scroll position
-			if (view.albums.content.scrollPosition!==null && view.albums.content.scrollPosition!==0) {
+			if (view.albums.content.scrollPosition!=null && view.albums.content.scrollPosition!==0) {
 				$(document).scrollTop(view.albums.content.scrollPosition)
 			}
 

+ 1 - 1
src/scripts/view/main.js

@@ -50,7 +50,7 @@ const getPhotoSize = function(photo) {
 	if (photo.json.width>view.width || photo.json.height>view.height) scaled = true
 
 	// Calculate pixel ratio of screen
-	if (pixelRatio!==undefined && pixelRatio>1) {
+	if (pixelRatio!=null && pixelRatio>1) {
 		view.width  = view.width * pixelRatio
 		view.height = view.height * pixelRatio
 	}

+ 1 - 1
src/scripts/visible.js

@@ -21,7 +21,7 @@ visible.photo = function() {
 }
 
 visible.search = function() {
-	if (search.hash!==null) return true
+	if (search.hash!=null) return true
 	return false
 }