@@ -379,7 +379,7 @@ var Gmail_ = function(localJQuery) {
379
379
else {
380
380
hash = api . tools . parse_url ( window . location . href ) . th ;
381
381
}
382
-
382
+
383
383
return hash ;
384
384
} ;
385
385
@@ -469,7 +469,7 @@ var Gmail_ = function(localJQuery) {
469
469
var dom = $ ( "div[role=navigation]" ) . find ( "[title*='" + api . tools . i18n ( 'inbox' ) + "']" ) ;
470
470
471
471
if ( dom . length > 0 ) {
472
- if ( dom [ 0 ] . text . indexOf ( '(' ) != - 1 ) {
472
+ if ( dom [ 0 ] . text . indexOf ( '(' ) != - 1 ) {
473
473
return parseInt ( dom [ 0 ] . text . split ( ':' ) [ 0 ] . replace ( / [ ^ 0 - 9 ] / g, '' ) ) ;
474
474
}
475
475
}
@@ -1558,12 +1558,12 @@ var Gmail_ = function(localJQuery) {
1558
1558
var page = api . get . current_page ( ) ;
1559
1559
var url = window . location . origin + window . location . pathname + '?ui=2&ik=' + api . tracker . ik + '&rid=' + api . tracker . rid + '&view=tl&num=120&rt=1' ;
1560
1560
if ( ! ! $ ( '.Dj:visible' ) . find ( "b:first" ) . text ( ) ) {
1561
- url += '&start=' + + parseInt ( $ ( '.Dj:visible' ) . find ( "b:first" ) . text ( ) - 1 ) +
1561
+ url += '&start=' + + parseInt ( $ ( '.Dj:visible' ) . find ( "b:first" ) . text ( ) - 1 ) +
1562
1562
'&start=' + parseInt ( $ ( '.Dj:visible' ) . find ( "b:first" ) . text ( ) - 1 ) ;
1563
1563
} else {
1564
1564
url += '&start=0' ;
1565
1565
}
1566
-
1566
+
1567
1567
if ( page . indexOf ( 'label/' ) == 0 ) {
1568
1568
url += '&cat=' + page . split ( '/' ) [ 1 ] + '&search=cat' ;
1569
1569
} else if ( page . indexOf ( 'category/' ) == 0 ) {
@@ -1904,33 +1904,18 @@ var Gmail_ = function(localJQuery) {
1904
1904
1905
1905
var url = null ;
1906
1906
if ( email_id != undefined ) {
1907
- url = window . location . origin + window . location . pathname + '?ui=2&ik=' + api . tracker . ik + '&view=om&th=' + email_id ;
1907
+ // this is normally included also but doesn't seem to be needed: '&attid=0&safe=1&zw'
1908
+ url = window . location . origin + window . location . pathname + '?view=att&th=' + email_id + '&disp=comp' ;
1908
1909
}
1909
1910
1910
1911
return url ;
1911
1912
} ;
1912
1913
1913
- api . tools . reformat_source = function ( responseText ) {
1914
- try {
1915
- // if parsing suceeds, its a HTML-embedded MIME-message
1916
- var parser = new DOMParser ( ) ;
1917
- var doc = parser . parseFromString ( responseText , "text/html" ) ;
1918
- var elem = doc . getElementById ( "raw_message_text" ) ;
1919
- var source = elem . innerHTML ;
1920
- return source ;
1921
- }
1922
- catch ( err ) {
1923
- // if parsing fails, its a raw mime message
1924
- }
1925
- return responseText ;
1926
- } ;
1927
1914
1928
1915
api . get . email_source = function ( email_id ) {
1929
1916
var url = api . helper . get . email_source_pre ( email_id ) ;
1930
1917
if ( url != null ) {
1931
- return api . tools . reformat_source (
1932
- api . tools . make_request ( url )
1933
- ) ;
1918
+ return api . tools . make_request ( url ) ;
1934
1919
}
1935
1920
return '' ;
1936
1921
} ;
@@ -1940,7 +1925,7 @@ var Gmail_ = function(localJQuery) {
1940
1925
var url = api . helper . get . email_source_pre ( email_id ) ;
1941
1926
if ( url != null ) {
1942
1927
api . tools . make_request_async ( url , 'GET' , function ( value ) {
1943
- callback ( api . tools . reformat_source ( value ) ) ;
1928
+ callback ( value ) ;
1944
1929
} ) ;
1945
1930
} else {
1946
1931
callback ( '' ) ;
@@ -2629,7 +2614,7 @@ var Gmail_ = function(localJQuery) {
2629
2614
2630
2615
if ( composeEl ) {
2631
2616
api . helper . trigger_mouse_click ( composeEl ) ;
2632
-
2617
+
2633
2618
return true ;
2634
2619
}
2635
2620
return false ;
0 commit comments