Skip to content

Commit dbd59b9

Browse files
guyhtguyht
committed
Merge pull request #37 from eliseomarmol/detection-improvements
Merging lots of changes from @eliseomarmol
2 parents 277f77e + 3e52f23 commit dbd59b9

File tree

5 files changed

+233
-144
lines changed

5 files changed

+233
-144
lines changed

‎vimari.safariextension/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>Author</key>
66
<string>Various</string>
77
<key>Builder Version</key>
8-
<string>9537.71</string>
8+
<string>9537.73.11</string>
99
<key>CFBundleDisplayName</key>
1010
<string>vimari</string>
1111
<key>CFBundleExecutable</key>

‎vimari.safariextension/Settings.plist‎

Lines changed: 98 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,38 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<array>
5+
<dict>
6+
<key>Title</key>
7+
<string>General</string>
8+
<key>Type</key>
9+
<string>Group</string>
10+
</dict>
511
<dict>
612
<key>DefaultValue</key>
713
<string>ctrl</string>
814
<key>Key</key>
915
<string>modifier</string>
1016
<key>Title</key>
11-
<string>Modifier key to preceed commands (blank for none)</string>
17+
<string>Command prefix (blank for none)</string>
1218
<key>Type</key>
1319
<string>TextField</string>
1420
</dict>
21+
<dict>
22+
<key>DefaultValue</key>
23+
<string></string>
24+
<key>Key</key>
25+
<string>excludedUrls</string>
26+
<key>Title</key>
27+
<string>Excluded URLs (comma separated)</string>
28+
<key>Type</key>
29+
<string>TextField</string>
30+
</dict>
31+
<dict>
32+
<key>Title</key>
33+
<string>Link hinting</string>
34+
<key>Type</key>
35+
<string>Group</string>
36+
</dict>
1537
<dict>
1638
<key>DefaultValue</key>
1739
<string>f</string>
@@ -34,41 +56,37 @@
3456
</dict>
3557
<dict>
3658
<key>DefaultValue</key>
37-
<string>x</string>
59+
<string>asdfjklqwerzxc</string>
3860
<key>Key</key>
39-
<string>closeTab</string>
61+
<string>linkHintCharacters</string>
4062
<key>Title</key>
41-
<string>Close Current Tab (open left tab)</string>
63+
<string>Link hint characters</string>
4264
<key>Type</key>
4365
<string>TextField</string>
4466
</dict>
4567
<dict>
4668
<key>DefaultValue</key>
47-
<string>shift+x</string>
69+
<false/>
4870
<key>Key</key>
49-
<string>closeTabReverse</string>
71+
<string>detectByCursorStyle</string>
5072
<key>Title</key>
51-
<string>Close Current Tab (open right tab)</string>
73+
<string>Extra detection by cursor style</string>
5274
<key>Type</key>
53-
<string>TextField</string>
75+
<string>CheckBox</string>
5476
</dict>
5577
<dict>
56-
<key>DefaultValue</key>
57-
<string>w</string>
58-
<key>Key</key>
59-
<string>tabForward</string>
6078
<key>Title</key>
61-
<string>Next Tab</string>
79+
<string>In-page navigation</string>
6280
<key>Type</key>
63-
<string>TextField</string>
81+
<string>Group</string>
6482
</dict>
6583
<dict>
6684
<key>DefaultValue</key>
67-
<string>q</string>
85+
<string>k</string>
6886
<key>Key</key>
69-
<string>tabBack</string>
87+
<string>scrollUp</string>
7088
<key>Title</key>
71-
<string>Previous Tab</string>
89+
<string>Scroll Up</string>
7290
<key>Type</key>
7391
<string>TextField</string>
7492
</dict>
@@ -84,137 +102,153 @@
84102
</dict>
85103
<dict>
86104
<key>DefaultValue</key>
87-
<string>k</string>
105+
<string>h</string>
88106
<key>Key</key>
89-
<string>scrollUp</string>
107+
<string>scrollLeft</string>
90108
<key>Title</key>
91-
<string>Scroll Up</string>
109+
<string>Scroll Left</string>
92110
<key>Type</key>
93111
<string>TextField</string>
94112
</dict>
95113
<dict>
96114
<key>DefaultValue</key>
97-
<string>h</string>
115+
<string>l</string>
98116
<key>Key</key>
99-
<string>scrollLeft</string>
117+
<string>scrollRight</string>
100118
<key>Title</key>
101-
<string>Scroll Left</string>
119+
<string>Scroll Right</string>
102120
<key>Type</key>
103121
<string>TextField</string>
104122
</dict>
105123
<dict>
106124
<key>DefaultValue</key>
107-
<string>l</string>
125+
<real>60</real>
108126
<key>Key</key>
109-
<string>scrollRight</string>
127+
<string>scrollSize</string>
128+
<key>MaximumValue</key>
129+
<real>200</real>
130+
<key>MinimumValue</key>
131+
<real>20</real>
132+
<key>StepValue</key>
133+
<real>20</real>
110134
<key>Title</key>
111-
<string>Scroll Right</string>
135+
<string>Scroll Size</string>
136+
<key>Type</key>
137+
<string>Slider</string>
138+
</dict>
139+
<dict>
140+
<key>DefaultValue</key>
141+
<string>u</string>
142+
<key>Key</key>
143+
<string>scrollUpHalfPage</string>
144+
<key>Title</key>
145+
<string>Scroll Up Half Page</string>
112146
<key>Type</key>
113147
<string>TextField</string>
114148
</dict>
115149
<dict>
116150
<key>DefaultValue</key>
117-
<string>shift+h</string>
151+
<string>d</string>
118152
<key>Key</key>
119-
<string>goBack</string>
153+
<string>scrollDownHalfPage</string>
120154
<key>Title</key>
121-
<string>History Back</string>
155+
<string>Scroll Down Half Page</string>
122156
<key>Type</key>
123157
<string>TextField</string>
124158
</dict>
125159
<dict>
126160
<key>DefaultValue</key>
127-
<string>shift+l</string>
161+
<string>g g</string>
128162
<key>Key</key>
129-
<string>goForward</string>
163+
<string>goToPageTop</string>
130164
<key>Title</key>
131-
<string>History Forward</string>
165+
<string>Go to the top of the page</string>
132166
<key>Type</key>
133167
<string>TextField</string>
134168
</dict>
135169
<dict>
136170
<key>DefaultValue</key>
137-
<string>r</string>
171+
<string>shift+g</string>
138172
<key>Key</key>
139-
<string>reload</string>
173+
<string>goToPageBottom</string>
140174
<key>Title</key>
141-
<string>Reload</string>
175+
<string>Go to the bottom of the page</string>
142176
<key>Type</key>
143177
<string>TextField</string>
144178
</dict>
179+
<dict>
180+
<key>Title</key>
181+
<string>Page/Tab navigation</string>
182+
<key>Type</key>
183+
<string>Group</string>
184+
</dict>
145185
<dict>
146186
<key>DefaultValue</key>
147-
<string>d</string>
187+
<string>shift+h</string>
148188
<key>Key</key>
149-
<string>scrollDownHalfPage</string>
189+
<string>goBack</string>
150190
<key>Title</key>
151-
<string>Scroll Down Half Page</string>
191+
<string>History Back</string>
152192
<key>Type</key>
153193
<string>TextField</string>
154194
</dict>
155195
<dict>
156196
<key>DefaultValue</key>
157-
<string>u</string>
197+
<string>shift+l</string>
158198
<key>Key</key>
159-
<string>scrollUpHalfPage</string>
199+
<string>goForward</string>
160200
<key>Title</key>
161-
<string>Scroll Up Half Page</string>
201+
<string>History Forward</string>
162202
<key>Type</key>
163203
<string>TextField</string>
164204
</dict>
165205
<dict>
166206
<key>DefaultValue</key>
167-
<string>g g</string>
207+
<string>r</string>
168208
<key>Key</key>
169-
<string>goToPageTop</string>
209+
<string>reload</string>
170210
<key>Title</key>
171-
<string>Go to the top of the page</string>
211+
<string>Reload</string>
172212
<key>Type</key>
173213
<string>TextField</string>
174214
</dict>
175215
<dict>
176216
<key>DefaultValue</key>
177-
<string>shift+g</string>
217+
<string>w</string>
178218
<key>Key</key>
179-
<string>goToPageBottom</string>
219+
<string>tabForward</string>
180220
<key>Title</key>
181-
<string>Go to the bottom of the page</string>
221+
<string>Next Tab</string>
182222
<key>Type</key>
183223
<string>TextField</string>
184224
</dict>
185225
<dict>
186226
<key>DefaultValue</key>
187-
<string>asdfjklqwerzxc</string>
227+
<string>q</string>
188228
<key>Key</key>
189-
<string>linkHintCharacters</string>
229+
<string>tabBack</string>
190230
<key>Title</key>
191-
<string>Link hint characters</string>
231+
<string>Previous Tab</string>
192232
<key>Type</key>
193233
<string>TextField</string>
194234
</dict>
195235
<dict>
196236
<key>DefaultValue</key>
197-
<real>60</real>
237+
<string>x</string>
198238
<key>Key</key>
199-
<string>scrollSize</string>
200-
<key>MaximumValue</key>
201-
<real>200</real>
202-
<key>MinimumValue</key>
203-
<real>20</real>
204-
<key>StepValue</key>
205-
<real>20</real>
239+
<string>closeTab</string>
206240
<key>Title</key>
207-
<string>Scroll Size</string>
241+
<string>Close Current Tab (open left tab)</string>
208242
<key>Type</key>
209-
<string>Slider</string>
210-
</dict>
243+
<string>TextField</string>
244+
</dict>
211245
<dict>
212246
<key>DefaultValue</key>
213-
<string></string>
247+
<string>shift+x</string>
214248
<key>Key</key>
215-
<string>excludedUrls</string>
249+
<string>closeTabReverse</string>
216250
<key>Title</key>
217-
<string>Excluded URLs (comma separated)</string>
251+
<string>Close Current Tab (open right tab)</string>
218252
<key>Type</key>
219253
<string>TextField</string>
220254
</dict>

‎vimari.safariextension/global.html‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
case 'changeTab' :
1818
changeTab(msg.message);
1919
break;
20-
case 'getActiveTabUrl' :
21-
getActiveTabUrl(msg.message);
22-
break;
2320
}
2421
}
2522

@@ -48,7 +45,8 @@
4845
'closeTabReverse' : safari.extension.settings.closeTabReverse,
4946
'modifier' : safari.extension.settings.modifier,
5047
'scrollSize' : safari.extension.settings.scrollSize,
51-
'excludedUrls' : safari.extension.settings.excludedUrls
48+
'excludedUrls' : safari.extension.settings.excludedUrls,
49+
'detectByCursorStyle': safari.extension.settings.detectByCursorStyle
5250
};
5351

5452
safari.application.activeBrowserWindow.tabs[getActiveTab()].page.dispatchMessage('setSettings', settings);
@@ -110,17 +108,6 @@
110108
}
111109
}
112110

113-
/*
114-
* Get the current url of the active tab
115-
*
116-
*/
117-
function getActiveTabUrl() {
118-
safari.application.activeBrowserWindow.tabs[getActiveTab()].page.dispatchMessage(
119-
'setActiveUrl',
120-
safari.application.activeBrowserWindow.activeTab.url
121-
);
122-
}
123-
124111
/*
125112
* Disable extension on non active tabs,
126113
* enable on active tab

0 commit comments

Comments
 (0)