Skip to content

Commit 3b7d52d

Browse files
author
peterdotjs
committed
Removing prop for text search extension issue. Updated badge limit count.
1 parent 809f239 commit 3b7d52d

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

js/main_view.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,13 @@
8484
if(updateCount === resize.badgeLimit){
8585
chrome.browserAction.setBadgeText({text:''});
8686
}
87+
} else {
88+
chrome.browserAction.setBadgeText({text:''});
8789
}
8890

8991
var curVersion = localStorage.getItem('version') || '',
9092
isOldVersion = (curVersion < '2.2.0' && curVersion !== '');
91-
93+
9294
var $body = $('body');
9395

9496
//user has never seen update
@@ -103,10 +105,10 @@
103105
resize.options.showUpdateModal();
104106
}
105107

106-
if(localStorage.getItem('update-seen') && updateCount === resize.badgeLimit && !localStorage.getItem('promo-seen')){
107-
$body.addClass('promo');
108-
resize.options.showPromoModal();
109-
}
108+
// if(localStorage.getItem('update-seen') && updateCount === resize.badgeLimit && !localStorage.getItem('promo-seen')){
109+
// $body.addClass('promo');
110+
// resize.options.showPromoModal();
111+
// }
110112

111113
$(function(){
112114
resize.util.initSortable();
@@ -177,7 +179,7 @@
177179

178180
resize.numRows = (orientation === 'horizontal' ? 1 : 2);
179181
resize.numCols = (orientation === 'horizontal' ? 2 : 1);
180-
182+
181183
/*
182184
* split width of screen based on the primary and secondary ratios
183185
*/
@@ -205,7 +207,7 @@
205207
} else {
206208
resize.width = Math.round(window.screen.availWidth/cols);
207209
resize.height = Math.round(window.screen.availHeight/rows);
208-
}
210+
}
209211
}
210212

211213
function resizeTabHelper(screenInfo, scaledOrientation){
@@ -251,4 +253,4 @@
251253

252254
window.resize.main_view = main_view;
253255

254-
})();
256+
})();

js/resize.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
custom_view: {},
2929
options: {},
3030
util: {},
31-
badgeLimit: 7,
31+
badgeLimit: 4,
3232
isMac: navigator.platform.toUpperCase().indexOf('MAC')!==-1
3333
};
3434

3535
window.resize = resize;
3636

37-
})();
37+
})();

public/tabResize.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,14 @@ if(!deferTracking) {
5454
custom_view: {},
5555
options: {},
5656
util: {},
57-
badgeLimit: 7,
57+
badgeLimit: 4,
5858
isMac: navigator.platform.toUpperCase().indexOf('MAC')!==-1
5959
};
6060

6161
window.resize = resize;
6262

6363
})();
64+
6465
/**
6566
* main_view.js
6667
* handles main view - bulk of resize functionality
@@ -147,11 +148,13 @@ if(!deferTracking) {
147148
if(updateCount === resize.badgeLimit){
148149
chrome.browserAction.setBadgeText({text:''});
149150
}
151+
} else {
152+
chrome.browserAction.setBadgeText({text:''});
150153
}
151154

152155
var curVersion = localStorage.getItem('version') || '',
153156
isOldVersion = (curVersion < '2.2.0' && curVersion !== '');
154-
157+
155158
var $body = $('body');
156159

157160
//user has never seen update
@@ -166,10 +169,10 @@ if(!deferTracking) {
166169
resize.options.showUpdateModal();
167170
}
168171

169-
if(localStorage.getItem('update-seen') && updateCount === resize.badgeLimit && !localStorage.getItem('promo-seen')){
170-
$body.addClass('promo');
171-
resize.options.showPromoModal();
172-
}
172+
// if(localStorage.getItem('update-seen') && updateCount === resize.badgeLimit && !localStorage.getItem('promo-seen')){
173+
// $body.addClass('promo');
174+
// resize.options.showPromoModal();
175+
// }
173176

174177
$(function(){
175178
resize.util.initSortable();
@@ -240,7 +243,7 @@ if(!deferTracking) {
240243

241244
resize.numRows = (orientation === 'horizontal' ? 1 : 2);
242245
resize.numCols = (orientation === 'horizontal' ? 2 : 1);
243-
246+
244247
/*
245248
* split width of screen based on the primary and secondary ratios
246249
*/
@@ -268,7 +271,7 @@ if(!deferTracking) {
268271
} else {
269272
resize.width = Math.round(window.screen.availWidth/cols);
270273
resize.height = Math.round(window.screen.availHeight/rows);
271-
}
274+
}
272275
}
273276

274277
function resizeTabHelper(screenInfo, scaledOrientation){
@@ -315,6 +318,7 @@ if(!deferTracking) {
315318
window.resize.main_view = main_view;
316319

317320
})();
321+
318322
/*
319323
* custom_view.js
320324
* handles custom view menu

0 commit comments

Comments
 (0)