aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjez2011-02-01 11:27:13 +0800
committerjez2011-02-01 11:27:13 +0800
commit4eb1d8ebcdae0816c8826792110564927124d5d6 (patch)
treeb4d3e4d5944fc0852b7ef59ab8b911452d150450
parent1133f348558e8e70aa5e76ca67a739a5303467bd (diff)
downloadvimium-4eb1d8ebcdae0816c8826792110564927124d5d6.tar.bz2
Cosmetics (semicolons)
-rw-r--r--bookmarks.js41
-rw-r--r--completionDialog.js52
2 files changed, 46 insertions, 47 deletions
diff --git a/bookmarks.js b/bookmarks.js
index d5ff7cc7..99e54e9c 100644
--- a/bookmarks.js
+++ b/bookmarks.js
@@ -1,12 +1,11 @@
-
function activateBookmarkFindModeToOpenInNewTab() {
- BookmarkMode.openInNewTab(true)
- BookmarkMode.enable()
+ BookmarkMode.openInNewTab(true);
+ BookmarkMode.enable();
}
function activateBookmarkFindMode() {
- BookmarkMode.openInNewTab(false)
- BookmarkMode.enable()
+ BookmarkMode.openInNewTab(false);
+ BookmarkMode.enable();
}
(function() {
@@ -16,22 +15,22 @@ function activateBookmarkFindMode() {
var BookmarkMode = {
isEnabled: function() {
- return this.enabled
+ return this.enabled;
},
openInNewTab: function(newTab) {
- this.newTab = newTab
+ this.newTab = newTab;
},
invertNewTabSetting: function() {
this.newTab = !this.newTab;
if(this.isEnabled()) {
- this.renderHUD()
+ this.renderHUD();
}
},
enable: function() {
this.enabled = true;
if(!this.initialized) {
- initialize.call(this)
+ initialize.call(this);
}
handlerStack.push({
@@ -65,16 +64,16 @@ function activateBookmarkFindMode() {
self.completionDialog = new CompletionDialog({
source: findBookmarks,
onSelect: function(selection) {
- var url = selection.url
+ var url = selection.url;
var isABookmarklet = function(url) {
- return url.indexOf("javascript:")===0
+ return url.indexOf("javascript:")===0;
}
if(!self.newTab || isABookmarklet(url)) {
- window.location=url
+ window.location=url;
}
else {
- window.open(url)
+ window.open(url);
}
self.disable();
@@ -84,7 +83,7 @@ function activateBookmarkFindMode() {
var displaytext = selection.title + " (" + selection.url + ")"
if(displaytext.length>70) {
- displaytext = displaytext.substr(0, 70)+"..."
+ displaytext = displaytext.substr(0, 70)+"...";
}
return displaytext.split(new RegExp(searchString, "i")).join("<strong>"+searchString+"</strong>")
@@ -96,8 +95,8 @@ function activateBookmarkFindMode() {
// shift key will toggle between new tab/same tab
if (event.keyCode == keyCodes.shiftKey) {
self.invertNewTabSetting();
- shiftWasPressedWhileToggled = true
- return
+ shiftWasPressedWhileToggled = true;
+ return;
}
var keyChar = getKeyChar(event);
@@ -117,7 +116,7 @@ function activateBookmarkFindMode() {
// shift key will toggle between new tab/same tab
if (event.keyCode == keyCodes.shiftKey && shiftWasPressedWhileToggled) {
self.invertNewTabSetting();
- shiftWasPressedWhileToggled = false
+ shiftWasPressedWhileToggled = false;
}
event.stopPropagation();
event.preventDefault();
@@ -125,12 +124,12 @@ function activateBookmarkFindMode() {
}
var findBookmarks = function(searchString, callback) {
- var port = chrome.extension.connect({ name: "getBookmarks" })
+ var port = chrome.extension.connect({ name: "getBookmarks" }) ;
port.onMessage.addListener(function(msg) {
- callback(msg.bookmarks)
- port = null
+ callback(msg.bookmarks);
+ port = null;
})
- port.postMessage({query:searchString})
+ port.postMessage({query:searchString});
};
//export global
diff --git a/completionDialog.js b/completionDialog.js
index fbe83ec0..1b2d3646 100644
--- a/completionDialog.js
+++ b/completionDialog.js
@@ -1,7 +1,7 @@
(function(window, document) {
var CompletionDialog = function(options) {
- this.options = options
+ this.options = options;
}
CompletionDialog.prototype = {
@@ -14,7 +14,7 @@
this.initialized=true;
}
handlerStack.push({ keydown: this.onKeydown });
- render.call(this)
+ render.call(this);
clearInterval(this._tweenId);
this._tweenId = Tween.fade(this.container, 1.0, 150);
}
@@ -30,18 +30,18 @@
},
getDisplayElement: function() {
if(!this.container) {
- this.container = createDivInside(document.body)
+ this.container = createDivInside(document.body);
}
- return this.container
+ return this.container;
},
getQueryString: function() {
- return this.query.join("")
+ return this.query.join("");
}
}
var initialize = function() {
- var self = this
- addCssToPage(completionCSS)
+ var self = this;
+ addCssToPage(completionCSS);
self.currentSelection=0;
@@ -51,29 +51,29 @@
if(self.currentSelection>0) {
self.currentSelection-=1;
}
- render.call(self,self.getQueryString(), self.completions)
+ render.call(self,self.getQueryString(), self.completions);
}
else if(keyChar==="down") {
if(self.currentSelection<self.completions.length-1) {
self.currentSelection+=1;
}
- render.call(self,self.getQueryString(), self.completions)
+ render.call(self,self.getQueryString(), self.completions);
}
else if(event.keyCode == keyCodes.enter) {
- self.options.onSelect(self.completions[self.currentSelection])
+ self.options.onSelect(self.completions[self.currentSelection]);
}
else if (event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey) {
if (self.query.length > 0) {
self.query.pop();
self.options.source(self.getQueryString(), function(completions) {
- render.call(self, self.getQueryString(), completions)
+ render.call(self, self.getQueryString(), completions);
})
}
}
else if(keyChar!=="left" && keyChar!="right") {
self.query.push(keyChar);
self.options.source(self.getQueryString(), function(completions) {
- render.call(self, self.getQueryString(), completions)
+ render.call(self, self.getQueryString(), completions);
})
}
@@ -87,33 +87,33 @@
if(this.isShown) {
this.searchString = searchString;
this.completions = completions;
- var container = this.getDisplayElement()
+ var container = this.getDisplayElement();
clearChildren(container);
if(searchString===undefined) {
this.container.className = "vimium-dialog";
- createDivInside(container).innerHTML=this.options.initialSearchText || "Begin typing"
+ createDivInside(container).innerHTML=this.options.initialSearchText || "Begin typing";
}
else {
this.container.className = "vimium-dialog vimium-completions";
- var searchBar = createDivInside(container)
- searchBar.innerHTML=searchString
- searchBar.className="vimium-searchBar"
+ var searchBar = createDivInside(container);
+ searchBar.innerHTML=searchString;
+ searchBar.className="vimium-searchBar";
- searchResults = createDivInside(container)
- searchResults.className="vimium-searchResults"
+ searchResults = createDivInside(container);
+ searchResults.className="vimium-searchResults";
if(completions.length<=0) {
- var resultDiv = createDivInside(searchResults)
- resultDiv.className="vimium-noResults"
- resultDiv.innerHTML="No results found"
+ var resultDiv = createDivInside(searchResults);
+ resultDiv.className="vimium-noResults";
+ resultDiv.innerHTML="No results found";
}
else {
for(var i=0;i<completions.length;i++) {
- var resultDiv = createDivInside(searchResults)
+ var resultDiv = createDivInside(searchResults);
if(i===this.currentSelection) {
- resultDiv.className="vimium-selected"
+ resultDiv.className="vimium-selected";
}
- resultDiv.innerHTML=this.options.renderOption(searchString, completions[i])
+ resultDiv.innerHTML=this.options.renderOption(searchString, completions[i]);
}
}
}
@@ -125,7 +125,7 @@
var createDivInside = function(parent) {
var element = document.createElement("div");
parent.appendChild(element);
- return element
+ return element;
}
var clearChildren = function(elem) {