1
0
mirror of https://github.com/gamaio/lobli.git synced 2024-12-22 11:42:40 +00:00

Move from beta to version 1.0.1, comment out future API code

The chrome extension won't work with the API key code (as I haven't added that to the API yet).
Also included is the current copy of the chrome extension that's on the webstore
This commit is contained in:
David Todd 2014-10-20 20:42:17 -05:00
parent 6a398e6041
commit 26faf57b8b
No known key found for this signature in database
GPG Key ID: 48E847F18074C953
3 changed files with 19 additions and 27 deletions

View File

@ -1,22 +1,5 @@
chrome.commands.onCommand.addListener(function(command){ // Keyboard shortcut trigger - Shorten current tab chrome.commands.onCommand.addListener(function(command){ // Keyboard shortcut trigger - Shorten current tab
if(command == "shortenTab"){ if(command == "shortenTab"){
var disabled = getData("lobli-disabled");
if(disabled == true){
testAPIKey();
}else{
chrome.tabs.query({active: true, currentWindow: true}, function(tabs){
var current = tabs[0]
shortenTabURL(current.id);
});
}
}
});
chrome.browserAction.onClicked.addListener(function(tab){ // Shorten current tab when lobli icon pressed
var disabled = getData("lobli-disabled");
if(disabled == true){
testAPIKey();
}else{
chrome.tabs.query({active: true, currentWindow: true}, function(tabs){ chrome.tabs.query({active: true, currentWindow: true}, function(tabs){
var current = tabs[0] var current = tabs[0]
shortenTabURL(current.id); shortenTabURL(current.id);
@ -24,6 +7,14 @@ chrome.browserAction.onClicked.addListener(function(tab){ // Shorten current tab
} }
}); });
chrome.browserAction.onClicked.addListener(function(tab){ // Shorten current tab when lobli icon pressed
chrome.tabs.query({active: true, currentWindow: true}, function(tabs){
var current = tabs[0]
shortenTabURL(current.id);
});
});
/* // Incomplete functions
chrome.runtime.onInstalled.addLIstener(function(data){ // Get a new API key from the get go chrome.runtime.onInstalled.addLIstener(function(data){ // Get a new API key from the get go
if(data.reason == "install"){ if(data.reason == "install"){
getNewAPIKey(); getNewAPIKey();
@ -38,9 +29,10 @@ chrome.runtime.onStartup.addListener(function(){ // Check to see if extension is
testAPIKey(); testAPIKey();
} }
}); });
*/
function showAlert(text){ function showAlert(text){
var opt ={ var opt = {
type: "basic", type: "basic",
title: "lob.li Chrome", title: "lob.li Chrome",
message: text, message: text,
@ -70,8 +62,8 @@ function shortenTabURL(tabid){ // Use just a tab id to shorten its url
function shortenURL(url){ // Creates a short url and copies it to clipboard function shortenURL(url){ // Creates a short url and copies it to clipboard
if(testURL(url)){ if(testURL(url)){
var key = getData("lobliAPIKey"); var url = encodeURIComponent(url);
sendAPIRequest("?shorten&url=" + url + "&key=" + key, function(req){ sendAPIRequest("?shorten&url=" + url, function(req){
var res = req.responseText.trim(); var res = req.responseText.trim();
switch(res){ switch(res){
case "dead": case "dead":
@ -84,7 +76,7 @@ function shortenURL(url){ // Creates a short url and copies it to clipboard
showAlert("General Error."); showAlert("General Error.");
break; break;
default: default:
copyToClipboard("http://b.lob.li/?"+res); copyToClipboard("http://lob.li/"+res);
showAlert("Link shortened. Short link copied to clipboard!"); showAlert("Link shortened. Short link copied to clipboard!");
break; break;
} }
@ -94,8 +86,7 @@ function shortenURL(url){ // Creates a short url and copies it to clipboard
function resolveURL(url){ // For when/if I decide to add the ability to resolve links through the extension function resolveURL(url){ // For when/if I decide to add the ability to resolve links through the extension
if(testURL(url)){ if(testURL(url)){
var key = getData("lobliAPIKey"); sendAPIRequest("?resolve&url=" + url, function(req){
sendAPIRequest("?resolve&url=" + url + "&key=" + key, function(req){
var res = req.responseText.trim(); var res = req.responseText.trim();
copyToClipboard(res); copyToClipboard(res);
showAlert("Link Resolved!\n" + res); showAlert("Link Resolved!\n" + res);
@ -105,14 +96,14 @@ function resolveURL(url){ // For when/if I decide to add the ability to resolve
function linkStats(url){ // Get stats to that specific link (context menu?) function linkStats(url){ // Get stats to that specific link (context menu?)
if(testURL(url)){ if(testURL(url)){
var key = getData("lobliAPIKey"); sendAPIRequest("?stats&url=" + url, function(req){
sendAPIRequest("?stats&url=" + url + "&key=" + key, function(req){
var res = req.responseText.trim(); var res = req.responseText.trim();
// format this info and make a popup window // format this info and make a popup window
}); });
} }
} }
/* // These functions are also incomplete
function testAPIKey(){ // Compares local key to server function testAPIKey(){ // Compares local key to server
var key = getData("lobliAPIKey"); var key = getData("lobliAPIKey");
if(key != undefined){ if(key != undefined){
@ -154,11 +145,12 @@ function getData(key){
return data; return data;
}); });
} }
*/
function sendAPIRequest(url, callback){ // Sends a GET request to the server, response is expected to be text and only short id, or resolved link function sendAPIRequest(url, callback){ // Sends a GET request to the server, response is expected to be text and only short id, or resolved link
var method = "GET"; var method = "GET";
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
req.open(method, "http://b.lob.li/ch/" + url, true); req.open(method, "http://api.lob.li/" + url, true);
req.onload = function(){ req.onload = function(){
callback(req); callback(req);
}; };

View File

@ -1,6 +1,6 @@
{ {
"name": "lob.li link shortener", "name": "lob.li link shortener",
"version": "0.0.1", "version": "1.0.1",
"manifest_version": 2, "manifest_version": 2,
"description": "lobli shortening and resolving without having to visit lob.li", "description": "lobli shortening and resolving without having to visit lob.li",
"homepage_url": "http://lob.li", "homepage_url": "http://lob.li",

BIN
lob.li.zip Normal file

Binary file not shown.