Skip to content
This repository was archived by the owner on Jan 1, 2020. It is now read-only.

Commit 8b29206

Browse files
intarstudentsintarstudents
committed
Merge branch 'master' of github.com:intarstudents/keyMazony
2 parents f7230f2 + ae52a23 commit 8b29206

File tree

8 files changed

+106
-145
lines changed

8 files changed

+106
-145
lines changed

‎google-chrome/listener.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var keysharkyListener = {
1+
var keymazonyListener = {
22

33
CloudPlayer: function(toggle)
44
{
@@ -11,21 +11,21 @@ var keysharkyListener = {
1111
document.head.removeChild(append);
1212
},
1313

14-
// Init keysharkyListener object
14+
// Init keymazonyListener object
1515
init: function(){
1616

1717
if (window.location.href.search(/^https\:\/\/www\.amazon\.com\/gp\/dmusic\/mp3\/player/) != -1){
1818

1919
chrome.extension.onRequest.addListener(function(request, sender, sendResponse) {
2020
var allToggles = {
21-
"play" : function(){ keysharkyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.masterPlay();"); },
22-
"stop" : function(){ keysharkyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.pause();"); },
23-
"prev" : function(){ keysharkyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.playHash('previous', null, null);"); },
24-
"next" : function(){ keysharkyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.playHash('next', null, null);"); },
25-
26-
"mute" : function(){ keysharkyListener.CloudPlayer("window.Mp3PlayerInterface.toggleMute();"); },
27-
"volup" : function(){ keysharkyListener.CloudPlayer("var volCont=window.jQuery('.volumeContainer');var volNow=volCont.slider('option','value');if(volNow<=90){window.Mp3PlayerInterface.setVolume((volNow/100)+0.1);volCont.slider('option','value',volNow+10)}else{window.Mp3PlayerInterface.setVolume(1);volCont.slider('option','value',100)}") },
28-
"voldown" : function(){ keysharkyListener.CloudPlayer("var volCont=window.jQuery('.volumeContainer');var volNow=volCont.slider('option','value');if(volNow>=10){window.Mp3PlayerInterface.setVolume((volNow/100)-0.1);volCont.slider('option','value',volNow-10)}else{window.Mp3PlayerInterface.setVolume(0);volCont.slider('option','value',0)}"); },
21+
"play" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.masterPlay();"); },
22+
"stop" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.pause();"); },
23+
"prev" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.playHash('previous', null, null);"); },
24+
"next" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.playHash('next', null, null);"); },
25+
26+
"mute" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.toggleMute();"); },
27+
"volup" : function(){ keymazonyListener.CloudPlayer("var volCont=window.jQuery('.volumeContainer');var volNow=volCont.slider('option','value');if(volNow<=90){window.Mp3PlayerInterface.setVolume((volNow/100)+0.1);volCont.slider('option','value',volNow+10)}else{window.Mp3PlayerInterface.setVolume(1);volCont.slider('option','value',100)}") },
28+
"voldown" : function(){ keymazonyListener.CloudPlayer("var volCont=window.jQuery('.volumeContainer');var volNow=volCont.slider('option','value');if(volNow>=10){window.Mp3PlayerInterface.setVolume((volNow/100)-0.1);volCont.slider('option','value',volNow-10)}else{window.Mp3PlayerInterface.setVolume(0);volCont.slider('option','value',0)}"); },
2929
};
3030

3131
if (request.method == "CloudPlayer" && allToggles[request.action] != undefined){
@@ -44,7 +44,7 @@ var keysharkyListener = {
4444

4545
this.unAllowedKeys = [16, 17, 18, 91];
4646

47-
// Inject in tab keyup listener, who will check for (maybe) valid keysharky combo
47+
// Inject in tab keyup listener, who will check for (maybe) valid keymazony combo
4848
window.addEventListener('keyup', function(event){
4949

5050
var modifiers = new Array();
@@ -62,7 +62,7 @@ var keysharkyListener = {
6262
keycode = event.keyCode;
6363
}
6464

65-
if(modifiers.length > 0 && !keysharkyListener.inArray(keysharkyListener.unAllowedKeys, keycode)) {
65+
if(modifiers.length > 0 && !keymazonyListener.inArray(keymazonyListener.unAllowedKeys, keycode)) {
6666

6767
var request = {
6868
"method" : "keyup",
@@ -92,7 +92,7 @@ var keysharkyListener = {
9292

9393
try{
9494

95-
keysharkyListener.init();
95+
keymazonyListener.init();
9696

9797
}catch(e){
9898
// Fail, but with dignity!

‎google-chrome/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "keyMazony",
3-
"version": "0.1",
3+
"version": "0.1.1",
44
"description": "Add missing keyboard functionality to Amazon Cloud Player!",
55
"background_page": "keymazony.html",
66
"options_page": "options.html",

‎safari.safariextension/Icon-32.png‎

2.96 KB
Loading

‎safari.safariextension/Icon-48.png‎

302 Bytes
Loading

‎safari.safariextension/Info.plist‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
<key>Author</key>
66
<string>Intars Students</string>
77
<key>CFBundleDisplayName</key>
8-
<string>keySharky</string>
8+
<string>keyMazony</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.intarstudents.keysharky</string>
10+
<string>com.intarstudents.keymazony</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>1.5.3</string>
14+
<string>0.1</string>
1515
<key>CFBundleVersion</key>
16-
<string>5</string>
16+
<string>1</string>
1717
<key>Chrome</key>
1818
<dict>
1919
<key>Context Menu Items</key>
2020
<array>
2121
<dict>
2222
<key>Command</key>
23-
<string>keysharky-options</string>
23+
<string>keymazony-options</string>
2424
<key>Identifier</key>
25-
<string>keysharkyOptions</string>
25+
<string>keymazonyOptions</string>
2626
<key>Title</key>
27-
<string>keySharky Options</string>
27+
<string>keyMazony Options</string>
2828
</dict>
2929
</array>
3030
<key>Database Quota</key>
3131
<real>1048576</real>
3232
<key>Global Page</key>
33-
<string>keysharky.html</string>
33+
<string>keymazony.html</string>
3434
</dict>
3535
<key>Content</key>
3636
<dict>
@@ -43,7 +43,7 @@
4343
</dict>
4444
</dict>
4545
<key>Description</key>
46-
<string>Add missing keyboard functionality to Grooveshark!</string>
46+
<string>Add missing keyboard functionality to Amazon Cloud Player!</string>
4747
<key>ExtensionInfoDictionaryVersion</key>
4848
<string>1.0</string>
4949
<key>Permissions</key>
@@ -57,8 +57,8 @@
5757
</dict>
5858
</dict>
5959
<key>Update Manifest URL</key>
60-
<string>http://keysharky.tldr.lv/safari.plist</string>
60+
<string>http://keymazony.tldr.lv/safari.plist</string>
6161
<key>Website</key>
62-
<string>http://keysharky.tldr.lv/</string>
62+
<string>http://keymazony.tldr.lv/</string>
6363
</dict>
6464
</plist>

safari.safariextension/keysharky.html renamed to safari.safariextension/keymazony.html

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
<html>
22
<script>
3-
var keysharky = {
3+
var keymazony = {
44

5-
// Init keysharky object
5+
// Init keymazony object
66
init: function(){
7-
keysharky.groovesharkTabID = null;
8-
keysharky.debug = false;
7+
keymazony.CloudPlayerTabID = null;
8+
keymazony.debug = false;
99

10-
keysharky.defaults = {
10+
keymazony.defaults = {
1111
"play" : '{"modifiers":["control","alt","shift"],"keycode":90,"enabled":true}',
1212
"stop" : '{"modifiers":["control","alt","shift"],"keycode":88,"enabled":true}',
1313
"prev" : '{"modifiers":["control","alt","shift"],"keycode":65,"enabled":true}',
1414
"next" : '{"modifiers":["control","alt","shift"],"keycode":68,"enabled":true}',
15-
"favorite" : '{"modifiers":["control","alt"],"keycode":83,"enabled":true}',
16-
"voteup" : '{"modifiers":["control","alt"],"keycode":65,"enabled":true}',
17-
"votedown" : '{"modifiers":["control","alt"],"keycode":90,"enabled":true}',
18-
"voteclear" : '{"modifiers":["control","alt"],"keycode":81,"enabled":true}',
15+
1916
"mute" : '{"modifiers":["control","shift"],"keycode":77,"enabled":true}',
2017
"volup" : '{"modifiers":["control","shift"],"keycode":190,"enabled":true}',
2118
"voldown" : '{"modifiers":["control","shift"],"keycode":188,"enabled":true}'
2219
};
2320

2421
safari.application.addEventListener("command", function(event) {
25-
if (event.command == "keysharky-options"){
22+
if (event.command == "keymazony-options"){
2623

2724
var newTab = safari.application.activeBrowserWindow.openTab();
2825
newTab.url = safari.extension.baseURI + "options.html";
@@ -33,10 +30,10 @@
3330
safari.application.addEventListener("message", function(request){
3431

3532
if (request.name == "keyup"){
36-
for(var toggle in keysharky.defaults){
33+
for(var toggle in keymazony.defaults){
3734
if (!localStorage[toggle]){
38-
localStorage[toggle] = keysharky.defaults[toggle];
39-
keysharky.log("localStorage fix: " + toggle + " reset");
35+
localStorage[toggle] = keymazony.defaults[toggle];
36+
keymazony.log("localStorage fix: " + toggle + " reset");
4037
}
4138
}
4239

@@ -84,19 +81,19 @@
8481
}catch(e){}
8582

8683
if (action){
87-
keysharky.log("Toggling '" + action + "' ...");
84+
keymazony.log("Toggling '" + action + "' ...");
8885

89-
if (keysharky.groovesharkTabID != null){
90-
keysharky.toggle(action);
86+
if (keymazony.CloudPlayerTabID != null){
87+
keymazony.toggle(action);
9188
}else{
9289

93-
keysharky.log("Searching for Grooveshark ...");
94-
keysharky.searchGrooveshark();
90+
keymazony.log("Searching for Amazon Cloud Sound ...");
91+
keymazony.searchCloudPlayer();
9592

96-
if (keysharky.groovesharkTabID != null){
97-
keysharky.toggle(action);
93+
if (keymazony.CloudPlayerTabID != null){
94+
keymazony.toggle(action);
9895
}else{
99-
keysharky.log("Where is groove?!");
96+
keymazony.log("Where is groove?!");
10097
}
10198

10299
}
@@ -106,73 +103,73 @@
106103
},false);
107104
},
108105

109-
// Find Grooveshark tab
110-
searchGrooveshark: function(){
106+
// Find CloudPlayer tab
107+
searchCloudPlayer: function(){
111108

112-
keysharky.groovesharkTabID = null;
109+
keymazony.CloudPlayerTabID = null;
113110

114111
for(var win in safari.application.browserWindows){
115-
if (keysharky.groovesharkTabID != null)
112+
if (keymazony.CloudPlayerTabID != null)
116113
break;
117114

118115
for(var tab in safari.application.browserWindows[win].tabs){
119-
if (keysharky.groovesharkTabID != null)
116+
if (keymazony.CloudPlayerTabID != null)
120117
break;
121118

122-
if (keysharky.checkUrl(safari.application.browserWindows[win].tabs[tab].url)){
119+
if (keymazony.checkUrl(safari.application.browserWindows[win].tabs[tab].url)){
123120

124-
keysharky.groovesharkTabID = {
121+
keymazony.CloudPlayerTabID = {
125122
"win" : win,
126123
"tab" : tab
127124
};
128125

129-
keysharky.log("The groove is found!");
126+
keymazony.log("The groove is found!");
130127

131128
}
132129
}
133130
}
134131
},
135132

136-
// Check if Grooveshark haven't moved an inch
133+
// Check if CloudPlayer haven't moved an inch
137134
checkUrl: function(url){
138-
return url.search(/^http\:\/\/(listen|preview|staging|retro)\.grooveshark\.com/) != -1 ? true : false;
135+
return url.search(/^https\:\/\/www\.amazon\.com\/gp\/dmusic\/mp3\/player/) != -1 ? true : false;
139136
},
140137

141-
// Send toggle to Grooveshark tab
138+
// Send toggle to CloudPlayer tab
142139
toggle: function(action){
143140
var url = "";
144141

145142
try{
146-
url = safari.application.browserWindows[keysharky.groovesharkTabID["win"]].tabs[keysharky.groovesharkTabID["tab"]].url;
143+
url = safari.application.browserWindows[keymazony.CloudPlayerTabID["win"]].tabs[keymazony.CloudPlayerTabID["tab"]].url;
147144
}catch(e){}
148145

149-
if (!keysharky.checkUrl(url)){
150-
keysharky.searchGrooveshark();
146+
if (!keymazony.checkUrl(url)){
147+
keymazony.searchCloudPlayer();
151148
}
152149

153-
if (keysharky.groovesharkTabID != null){
150+
if (keymazony.CloudPlayerTabID != null){
154151
try{
155152

156-
safari.application.browserWindows[keysharky.groovesharkTabID["win"]].
157-
tabs[keysharky.groovesharkTabID["tab"]].page.dispatchMessage("Grooveshark", action);
153+
safari.application.browserWindows[keymazony.CloudPlayerTabID["win"]].
154+
tabs[keymazony.CloudPlayerTabID["tab"]].page.dispatchMessage("CloudPlayer", action);
158155

159-
keysharky.log("Toggled '" + request + "' !");
156+
keymazony.log("Toggled '" + request + "' !");
160157

161158
}catch(e){}
162159
}else{
163-
keysharky.log("Lost Grooveshark :(");
160+
keymazony.log("Lost Amazon Cloud Player :(");
164161
}
165162
},
166163

167164
// Debugging is half of victory!
168165
log: function(msg){
169-
if (keysharky.debug && msg){
170-
console.log("keysharky ---> " + msg);
166+
if (keymazony.debug && msg){
167+
console.log("keymazony ---> " + msg);
171168
}
172169
},
173170

174171
};
175172

176-
window.addEventListener("load", function(e) { keysharky.init(e); }, false);
173+
window.addEventListener("load", function(e) { keymazony.init(e); }, false);
177174
</script>
178175
</html>

‎safari.safariextension/listener.js‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,43 @@
1-
var keysharkyListener = {
1+
var keymazonyListener = {
22

3-
Grooveshark: function(toggle)
3+
CloudPlayer: function(toggle)
44
{
55
var elem = document.createElement("script");
66
elem.type = "text/javascript";
7-
elem.innerHTML = "if (typeof(Grooveshark) != 'undefined') Grooveshark." + toggle + ";";
7+
elem.innerHTML = toggle;
88

99
var append = document.head.appendChild(elem);
1010
document.head.removeChild(append);
1111
},
1212

1313
init: function(){
1414

15-
if (window.location.href.search(/^http\:\/\/(listen|preview|staging|retro)\.grooveshark\.com/) != -1){
15+
if (window.location.href.search(/^https\:\/\/www\.amazon\.com\/gp\/dmusic\/mp3\/player/) != -1){
1616
safari.self.addEventListener("message", function(request){
1717

1818
var allToggles = {
19-
"play" : function(){ keysharkyListener.Grooveshark("togglePlayPause()"); },
20-
"stop" : function(){ keysharkyListener.Grooveshark("pause()"); },
21-
"prev" : function(){ keysharkyListener.Grooveshark("previous()"); },
22-
"next" : function(){ keysharkyListener.Grooveshark("next()"); },
23-
24-
"favorite" : function(){ keysharkyListener.Grooveshark("favoriteCurrentSong()"); },
25-
"voteup" : function(){ keysharkyListener.Grooveshark("voteCurrentSong(1)"); },
26-
"votedown" : function(){ keysharkyListener.Grooveshark("voteCurrentSong(-1)"); },
27-
"voteclear" : function(){ keysharkyListener.Grooveshark("voteCurrentSong(0)"); },
28-
29-
"mute" : function(){ keysharkyListener.Grooveshark("setIsMuted(Grooveshark.getIsMuted() ? false : true)"); },
30-
"volup" : function(){ keysharkyListener.Grooveshark("setVolume(Grooveshark.getVolume() + 10)"); },
31-
"voldown" : function(){ keysharkyListener.Grooveshark("setVolume(Grooveshark.getVolume() - 10)"); }
19+
"play" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.masterPlay();"); },
20+
"stop" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.pause();"); },
21+
"prev" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.playHash('previous', null, null);"); },
22+
"next" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.currentPlayer.playHash('next', null, null);"); },
23+
24+
"mute" : function(){ keymazonyListener.CloudPlayer("window.Mp3PlayerInterface.toggleMute();"); },
25+
"volup" : function(){ keymazonyListener.CloudPlayer("var volCont=window.jQuery('.volumeContainer');var volNow=volCont.slider('option','value');if(volNow<=90){window.Mp3PlayerInterface.setVolume((volNow/100)+0.1);volCont.slider('option','value',volNow+10)}else{window.Mp3PlayerInterface.setVolume(1);volCont.slider('option','value',100)}") },
26+
"voldown" : function(){ keymazonyListener.CloudPlayer("var volCont=window.jQuery('.volumeContainer');var volNow=volCont.slider('option','value');if(volNow>=10){window.Mp3PlayerInterface.setVolume((volNow/100)-0.1);volCont.slider('option','value',volNow-10)}else{window.Mp3PlayerInterface.setVolume(0);volCont.slider('option','value',0)}"); },
3227
};
3328

34-
if (request.name == "Grooveshark" && allToggles[request.message] != undefined){
29+
if (request.name == "CloudPlayer" && allToggles[request.message] != undefined){
3530
allToggles[request.message]();
3631
}
3732

3833
}, false);
3934

4035
}
4136

42-
if (window.location.href.search(/^safari\-extension\:\/\/com\.intarstudents\.keysharky/) == -1){
37+
if (window.location.href.search(/^safari\-extension\:\/\/com\.intarstudents\.keymazony/) == -1){
4338
this.unAllowedKeys = [16, 17, 18, 91];
4439

45-
// Inject in tab keyup listener, who will check for (maybe) valid keysharky combo
40+
// Inject in tab keyup listener, who will check for (maybe) valid keymazony combo
4641
window.addEventListener('keyup', function(event){
4742

4843
var modifiers = new Array();
@@ -60,7 +55,7 @@ var keysharkyListener = {
6055
keycode = event.keyCode;
6156
}
6257

63-
if(modifiers.length > 0 && !keysharkyListener.inArray(keysharkyListener.unAllowedKeys, keycode)) {
58+
if(modifiers.length > 0 && !keymazonyListener.inArray(keymazonyListener.unAllowedKeys, keycode)) {
6459

6560
var request = {
6661
"modifiers" : modifiers,
@@ -90,7 +85,7 @@ var keysharkyListener = {
9085

9186
try{
9287

93-
keysharkyListener.init();
88+
keymazonyListener.init();
9489

9590
}catch(e){
9691
// Fail, but with dignity!

0 commit comments

Comments
 (0)