fix: token

Author: manjun.xsy

gitlab-tree.crx

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCm001Bs8+4MAz+
+Nz90tYvyer8lcTlbDMCQZZZUJLQi+k+yaM0ZDFuIPCWEmWBXQmbZVQkJj3KvqkQj
+vmyjqy+dvkG3JFAYyOXCI6jEg97MNuMgPeNsD8QvNdff1SQl3GCyOqgG9es+V5b+
+3zC27JKqH3j+FpSlYRkw7iZQnkLj2WsrajSqf0LXnv1x0d3IGioZdm1ha0T7YNUV
+kDCSdraRWQIONXlMF2xylUN+HbEwzSwFBtFD9dA+bJTLdoCg5DGw5zev+4W1ihbc
+GRx4JzNRkz1w5oPvjSF52lqckPaIEil02JpjdP//jB0sPodxuKCmKNyvicuJAWvB
+pdGEfiIrAgMBAAECggEAAjg9hupFkUXSZm+FwJ/JxOgtMupWwQdiaIlxfp0eaHi8
+JruOPw8TCLUEKsd/qKmRhMLE5AOsmvnA/ljCSUs1zvuBFFa/WhUSOYsP6811YXI5
+g2xPYlizW41z2d6UJIzSHIz7P1x2TNYNhEaj90seiHTyvy69u5WXKDeC+v+gFDgC
+2eTACnCmz5IpelRz0Qu0bPCtwxvgl6KEIGE2LSe+9KT9DDVwuJ/iD/M2IiQtKb94
+VjhZ3K3N1dSdPSLO5G384z5tKPO0+yVXDDELH4cyK0k7Hntu81SzkI10clCeBOGc
+tnlN2E5G7lvP3Xg/OlTriyAdeNPREEaiEuk+vRmgAQKBgQDdRZYs5K9Pfy/UWdVP
+4Wa13QTAcgtkylWgU04iIBc5ZDja1lcyvOWeDg2sA67Geh88wKP0XBf7GwAVdPzO
+KwJf1wSVfyhsl/jws4pj8vUQWs5ogPKSNNm8EIbz2El8p2fsXF18rC52qASiAqew
+ojAWAJI2e740c16SfZf2NwhKAQKBgQDBAiD3kfB2zZRuO9LSvuo2+4heUYkQe0mD
+wwodBJj/aQgrkGKzKga+AFbVUdQcpOD+CXf59g5qYh4XfAohEc6k3ZwOaO/jbxZg
+bKQPQGeoG1lDaCheIPfUmlj6zC/kTM9ZQP1fATirNdfbFGsvTSQssEHsYmOyEQcm
+USvniBG0KwKBgG5xGCbqMdKFEhN0jzLit0hYu9FuWt+A2kI+skX4LH9Z1cLsrvNF
+M3qzWwGbiPXJ6KODJ5KFEPcln+IV1UT2VKYPhVs077FcHUXO52lB0C3MlS+2BN0T
+AgaLXUCCmRNd31IrPAJJUpuo+z7+AkL4gPXKbTBCjUpSt0Z454teJoYBAoGALwm5
+xxxGIm4P0p25z6q/og7DOVldsiqZzAbonBHWx8htOVDC/S8s3XlvsCV1MFXuj3r3
+Rm/1K3AmLUsJnO2eEwf/VHO2oxMbvPw9L4peuNWRd6AW1nnqbGIBdX313gnqLrJs
+DY9apD9HEBl11d1TB6EdL+L6sRb9SxVVQeQjjGkCgYEAzipHKVa8LXeV3DWwJsJV
+SbCdFMwRyLoE2bnqjdhAjP3R8RyIFF2+PcA7g/DSWRD/584T/Ek8QgxDjBVVntmu
+Y+RoRZ+f6BArruZOkxaB0KZY6rXK43M+OGPlzfZEgY7iZCoYUaALg8MbrZj+xAJD
+NwjoYlXZj0iwKUN7MqR0tpg=
+-----END PRIVATE KEY-----

src.pem

@@ -4,6 +4,15 @@
  * @Last Modified by:  FrankFan
  */
 
+function getAllContent(selector) {
+  var wholeText = '';
+  let contents = $(selector).contents();
+  for (var i = 0; i < contents.length; i++) {
+    wholeText += contents[i].wholeText + ';';
+  }
+  return wholeText;
+}
+
 var GitlabTree = (function($, win) {
   var private_token,
     project_id,
@@ -17,41 +26,9 @@ var GitlabTree = (function($, win) {
     $jstree;
 
   var getPrivateToken = function(dtd) {
-    var arrXmlNode;
     var objXml = {};
-    var wholeText;
-
-    if ($('head script[type="text/javascript"]').contents()[0]) {
-      wholeText = $('head script[type="text/javascript"]').contents()[0]['wholeText'];
-    }
-
-    if (wholeText) {
-      if (!/window.gon/ig.test(wholeText)) {
-        return;
-      }
-    } else {
-      if ($('head script').contents()[0]) {
-        wholeText = $('head script').contents()[0]['wholeText'];
-      }
-
-      if (!wholeText) {
-        return;
-      } else {
-        if (!/window.gon/ig.test(wholeText)) {
-          // return;
-        }
-      }
-    }
-
-    if ($('head script[type="text/javascript"]').contents()[0]) {
-      arrXmlNode = wholeText.toString().split(';')
-    } else {
-      if ($('head script').contents()[0]) {
-        arrXmlNode = wholeText.toString().split(';')
-      } else {
-        return false;
-      }
-    }
+    var wholeText = getAllContent('head script');
+    var arrXmlNode = wholeText.toString().split(';')
 
     for (var i = 1; i < arrXmlNode.length - 1; i++) {
       var item = arrXmlNode[i].split('=');
@@ -67,7 +44,11 @@ var GitlabTree = (function($, win) {
 
     if (private_token) {
       private_token = private_token.replace(/\"/g, '');
+      dtd.resolve(true);
     } else {
+      //dtd.reject(false);
+      return;
+      // TODO
       if (isFilesTab()) {
         tryToGetTokenInGitlab9(function(result) {
           if (result && result != 401) {
@@ -103,7 +84,7 @@ var GitlabTree = (function($, win) {
 
   var initVariables = function() {
     project_id = $('#project_id').val() || $('#search_project_id').val();
-    repository_ref = $('#repository_ref').val();
+    repository_ref = $('#repository_ref').val() || 'master';
     originUrl = window.location.origin;
 
     var apiRootUrl = originUrl + '/api/v3/projects/';
@@ -113,6 +94,8 @@ var GitlabTree = (function($, win) {
 
     var tmpClassName = $('.container').length > 0 ? '.container' : '.content-wrapper .container-fluid';
     initContainerML = $(tmpClassName).offset() && $(tmpClassName).offset().left;
+
+    return project_id != null;
   }
 
   var generateTreeNodes = function(serverResult) {
@@ -173,8 +156,8 @@ var GitlabTree = (function($, win) {
     if (cnode.data === 'tree') {
       nodesDisplay.forEach(function(item) {
         var newNodeObj = $jstree.jstree(true).create_node(cnode, item, 'last', function(data) {
-          // console.log('new node created.');
-          // console.log(data);
+           console.log('new node created.');
+           console.log(data);
         });
         $jstree.jstree(true).open_node(cnode);
       });
@@ -199,7 +182,7 @@ var GitlabTree = (function($, win) {
   }
 
   var handleRefresh = function() {
-    var lastElement = getLocalStorageData().lastElement || '';
+    var lastElement = $('#path').val() || getLocalStorageData().lastElement || '';
     var requestPath = lastElement ? makeRequestArr(lastElement) : [];
     var promises = requestPath.map(function(path) {
       return getResultJson(path);
@@ -211,7 +194,7 @@ var GitlabTree = (function($, win) {
             var nodesDisplay = generateTreeNodes(item);
             var cssSelector = (index === 0) ? '.jstree .jstree-container-ul li a' : '.jstree .jstree-container-ul li.jstree-open ul li';
             expandSubTreeByJSON(cssSelector, requestPath, lastElement, nodesDisplay);
-            showGitlabTree();
+            isOnFilesTab() && showGitlabTree();
           });
         } else {
           $('.jstree .jstree-container-ul li a').each(function(index, item) {
@@ -220,7 +203,7 @@ var GitlabTree = (function($, win) {
               $(this).parent().find('div.jstree-wholerow').addClass('jstree-wholerow-clicked');
             }
           });
-          showGitlabTree();
+          isOnFilesTab() && showGitlabTree();
         }
       })
       .catch(function(err) {
@@ -282,6 +265,10 @@ var GitlabTree = (function($, win) {
   }
 
   var isFilesTab = function() {
+    return true;
+  }
+
+  var isOnFilesTab = function() {
     // gitlab 8.x
     var currentTabText = $('.project-navigation li.active a').text();
     if (currentTabText === 'Files' || $('.nav.nav-sidebar li.active a').text().trim() === 'Files') {
@@ -591,6 +578,10 @@ var GitlabTree = (function($, win) {
   var checkRepos = function(repos) {
     var result = true;
 
+    if (project_id == null) {
+      return false;
+    }
+
     if (repos && repos.length > 0) {
       for (var key in repos) {
         var objRepoInfo = repos[key];
@@ -656,19 +647,34 @@ var GitlabTree = (function($, win) {
     $('.open-tree').hide();
   }
 
+  var reload = function(e) {
+    if (e.target.nodeName === 'BODY') {
+      console.log('reload');
+      $(document).off('DOMNodeRemoved', reload);
+      setTimeout(function() {
+        init(getApiProjects);
+      });
+    }
+  };
+
   var init = function(next) {
     var p = new Promise(function(resolve, reject) {
       $.Deferred(getPrivateToken)
       .done(function(status) {
         resolve(status);
+
+        if (!initVariables()) {
+          return;
+        }
+
         if (isFilesTab()) {
           $(window).resize(function() {
             updateLayoutUI('show');
           });
         }
         createBtn();
         showSpinner();
-        initVariables();
+        $(document).on('DOMNodeRemoved', reload);
       })
       .fail(function(status) {
         console.warn("Error: ", status);

src/gitlabtree.js

@@ -145,5 +145,5 @@ a.gitlabtree_toggle {
 }
 
 .vh {
-    visibility: hidden !important;
+/*    visibility: hidden !important; */
 }

src/main.css

@@ -26,7 +26,7 @@
       "css": ["main.css",
               "libs/nprogress/nprogress.css",
               "libs/jstree/jstree.css"],
-      "run_at": "document_start"
+      "run_at": "document_idle"
     }
   ]
 }