合并 octotree/master 最新代码，更新至 2.4.6 版本

# Conflicts:
#	dist/chrome.crx
#	dist/chrome.zip
#	dist/firefox.zip
#	dist/opera.nex
#	src/adapters/pjax.js

HISTORY.md

@@ -1,3 +1,12 @@
+### v2.4.6
+* Fix random page reload
+
+### v2.4.4
+* Fix layout in project page
+* Fix intermittent page reload
+* Support file icon in Safari
+* Set default GitHub token options
+
 ### v2.4.3
 * Fix issue branch path not encoded in file navigation
 

gulpfile.babel.js

@@ -129,11 +129,11 @@ gulp.task('firefox:zip', () => {
 
 // Safari
 gulp.task('safari:template', () => {
-  return buildTemplate({})
+  return buildTemplate({SUPPORT_FILE_ICONS: true})
 })
 
 gulp.task('safari:js', ['safari:template', 'lib:ondemand'], () => {
-  return buildJs([], {})
+  return buildJs([], {SUPPORT_FILE_ICONS: true})
 })
 
 gulp.task('safari', ['safari:js'], () => {
@@ -143,6 +143,7 @@ gulp.task('safari', ['safari:js'], () => {
       ['./libs/**/*', '!./libs/ondemand{,/**}', './tmp/octotree.*', './tmp/ondemand.js'],
       './tmp/safari/octotree.safariextension/'
     ),
+    pipe('./libs/file-icons.css', $.replace('../fonts', 'fonts'), './tmp/safari/octotree.safariextension/'),
     pipe('./src/config/safari/Info.plist', $.replace('$VERSION', getVersion()), './tmp/safari/octotree.safariextension')
   )
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "octotree",
-  "version": "2.4.3",
+  "version": "2.4.6",
   "description": "Code tree for GitHub",
   "main": "inject.js",
   "scripts": {

src/adapters/pjax.js

@@ -2,10 +2,10 @@ class PjaxAdapter extends Adapter {
   constructor(store) {
     super(['jquery.pjax.js'], store)
 
-    $.pjax.defaults.timeout = 0 // no timeout
     $(document)
-      .on('pjax:send', () => $(document).trigger(EVENT.REQ_START))
+      .on('pjax:start', () => $(document).trigger(EVENT.REQ_START))
       .on('pjax:end', () => $(document).trigger(EVENT.REQ_END))
+      .on('pjax:timeout', (e) => e.preventDefault())
   }
 
   // @override
@@ -77,7 +77,8 @@ class PjaxAdapter extends Adapter {
         // needs full path for pjax to work with Firefox as per cross-domain-content setting
         url: location.protocol + '//' + location.host + path,
         container: $pjaxContainer,
-        fragment: fragment
+        fragment: fragment,
+        timeout: 0 // global timeout doesn't seem to work, use this instead
       })
     }
     else {

src/config/safari/Info.plist

@@ -29,12 +29,14 @@
 					<string>jstree.js</string>
 					<string>keymaster.js</string>
 					<string>ondemand.js</string>
+					<string>file-icons.js</string>
 					<string>octotree.js</string>
 				</array>
 			</dict>
 			<key>Stylesheets</key>
 			<array>
 				<string>jstree.css</string>
+				<string>file-icons.css</string>
 				<string>octotree.css</string>
 			</array>
 			<key>Whitelist</key>

src/styles/base.less

@@ -177,6 +177,15 @@
       font-size: 12px;
       margin-left: 17px;
     }
+
+    .octotree_opts_backing {
+      color: gray;
+      font-size: 12px;
+      margin-left: 2px;
+      a {
+        float: none;
+      }
+    }
   }
 }