Fixed issues #75, #76, #90, #93 and #94

jccguimaraes · Nov 12, 2016 · f380810 · f380810
1 parent b3441fa
commit f380810
Show file tree

Hide file tree

Showing 13 changed files with 751 additions and 111 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.3.26] - 2016-11-12
+
+### Fixed
+
+- ISSUE: shortcuts are not working using Windows ([#94](https://github.com/jccguimaraes/atom-project-viewer/issues/94))
+- Fix: Missing DEV Icons ([#93](https://github.com/jccguimaraes/atom-project-viewer/issues/93))
+- Bug: Can't remove project from client or group via the update modal ([#75](https://github.com/jccguimaraes/atom-project-viewer/issues/75))
+
+### Added
+
+- FEATURE: Clear project search after selection ([#90](https://github.com/jccguimaraes/atom-project-viewer/issues/90))
+- ISSUE: Close my openned files when I switch the "context" ([#76](https://github.com/jccguimaraes/atom-project-viewer/issues/76))
+
 ## [0.3.25] - 2016-10-07
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -67,3 +67,7 @@ This project follows the [all-contributors](https://github.com/kentcdodds/all-co
 
 ### Other
 You can follow me on [Twitter](https://twitter.com/jccguimaraes)
+
+### A Special Thank You!
+I thank all you guys that are and did give great feedback to this project.
+:beers: for everyone.
diff --git a/keymaps/project-viewer.json b/keymaps/project-viewer.json
@@ -1,7 +1,7 @@
 {
-  ".platform-darwin, .platform-win32, .platform-linux": {
-      "ctrl-alt-cmd-v": "project-viewer:toggle-select-view",
-      "ctrl-alt-cmd-b": "project-viewer:toggle-display",
-      "ctrl-alt-cmd-n": "project-viewer:toggle-focus"
-  }
+    ".platform-darwin, .platform-win32, .platform-linux": {
+        "shift-ctrl-alt-v": "project-viewer:toggle-select-view",
+        "shift-ctrl-alt-b": "project-viewer:toggle-display",
+        "shift-ctrl-alt-n": "project-viewer:toggle-focus"
+    }
 }
diff --git a/package.json b/package.json
@@ -14,9 +14,9 @@
     "atom": ">=1.10.0"
   },
   "dependencies": {
-    "atom-space-pen-views": "latest",
-    "devicon": "latest",
-    "octicons": "latest"
+    "atom-space-pen-views": "2.2.0",
+    "devicon": "2.0.0",
+    "octicons": "5.0.1"
   },
   "devDependencies": {
     "all-contributors-cli": "latest"

diff --git a/src/config.js b/src/config.js
@@ -74,6 +74,12 @@ const config = {
         type: 'boolean',
         default: true,
         order: 10
+    },
+    'keepContext': {
+        description: 'Keep context between project switching.',
+        type: 'boolean',
+        default: false,
+        order: 11
     }
 };
 

diff --git a/src/devicons.json b/src/devicons.json
@@ -1,86 +1,77 @@
 {
     "bundle": "2.1.2",
     "icons": [
-        "devicon-amazonwebservice",
-        "devicon-android",
-        "devicon-angularjs",
-        "devicon-apache",
-        "devicon-appcelerator",
-        "devicon-apple",
-        "devicon-atom",
-        "devicon-backbonejs",
-        "devicon-bitbucket",
-        "devicon-bootstrap",
-        "devicon-bower",
-        "devicon-c",
-        "devicon-chrome",
-        "devicon-codeigniter",
-        "devicon-coffeescript",
-        "devicon-confluence",
-        "devicon-cplusplus",
-        "devicon-csharp",
-        "devicon-css3",
-        "devicon-d3js",
-        "devicon-debian",
-        "devicon-django",
-        "devicon-docker",
-        "devicon-doctrine",
-        "devicon-dot-net",
-        "devicon-drupal",
-        "devicon-erlang",
-        "devicon-firefox",
-        "devicon-foundation",
-        "devicon-gimp",
-        "devicon-git",
-        "devicon-github",
-        "devicon-gitlab",
-        "devicon-go",
-        "devicon-grunt",
-        "devicon-gulp",
-        "devicon-heroku",
-        "devicon-html5",
-        "devicon-ie10",
-        "devicon-illustrator",
-        "devicon-inkscape",
-        "devicon-java",
-        "devicon-javascript",
-        "devicon-jeet",
-        "devicon-jetbrains",
-        "devicon-jquery",
-        "devicon-krakenjs",
-        "devicon-laravel",
-        "devicon-less",
-        "devicon-linux",
-        "devicon-meteor",
-        "devicon-mongodb",
-        "devicon-moodle",
-        "devicon-mysql",
-        "devicon-nginx",
-        "devicon-nodejs",
-        "devicon-nodewebkit",
-        "devicon-oracle",
-        "devicon-photoshop",
-        "devicon-php",
-        "devicon-phpstorm",
-        "devicon-postgresql",
-        "devicon-python",
-        "devicon-rails",
-        "devicon-react",
-        "devicon-redhat",
-        "devicon-redis",
-        "devicon-ruby",
-        "devicon-safari",
-        "devicon-sass",
-        "devicon-sourcetree",
-        "devicon-ssh",
-        "devicon-symfony",
-        "devicon-travis",
-        "devicon-trello",
-        "devicon-ubuntu",
-        "devicon-vim",
-        "devicon-windows8",
-        "devicon-wordpress",
-        "devicon-yii",
-        "devicon-zend"
+        "devicon-amazonwebservices-original",
+        "devicon-android-plain",
+        "devicon-angularjs-plain",
+        "devicon-apache-plain",
+        "devicon-appcelerator-original",
+        "devicon-apple-original",
+        "devicon-atom-original",
+        "devicon-backbonejs-plain",
+        "devicon-bootstrap-plain",
+        "devicon-bower-plain",
+        "devicon-c-plain",
+        "devicon-chrome-plain",
+        "devicon-codeigniter-plain",
+        "devicon-coffeescript-original",
+        "devicon-cplusplus-plain",
+        "devicon-csharp-plain",
+        "devicon-css3-plain",
+        "devicon-debian-plain",
+        "devicon-django-plain",
+        "devicon-docker-plain",
+        "devicon-doctrine-plain",
+        "devicon-dot-net-plain",
+        "devicon-drupal-plain",
+        "devicon-erlang-plain",
+        "devicon-firefox-plain",
+        "devicon-foundation-plain",
+        "devicon-gimp-plain",
+        "devicon-git-plain",
+        "devicon-go-plain",
+        "devicon-grunt-plain",
+        "devicon-gulp-plain",
+        "devicon-heroku-original",
+        "devicon-html5-plain",
+        "devicon-ie10-original",
+        "devicon-illustrator-plain",
+        "devicon-inkscape-plain",
+        "devicon-java-plain",
+        "devicon-javascript-plain",
+        "devicon-jetbrains-plain",
+        "devicon-jquery-plain",
+        "devicon-krakenjs-plain",
+        "devicon-laravel-plain",
+        "devicon-less-plain-wordmark",
+        "devicon-linux-plain",
+        "devicon-meteor-plain",
+        "devicon-mongodb-plain",
+        "devicon-moodle-plain",
+        "devicon-mysql-plain",
+        "devicon-nginx-original",
+        "devicon-nodejs-plain",
+        "devicon-nodewebkit-plain",
+        "devicon-oracle-original",
+        "devicon-photoshop-plain",
+        "devicon-php-plain",
+        "devicon-postgresql-plain",
+        "devicon-python-plain",
+        "devicon-rails-plain",
+        "devicon-react-original",
+        "devicon-redhat-plain",
+        "devicon-redis-plain",
+        "devicon-ruby-plain",
+        "devicon-safari-plain",
+        "devicon-sass-original",
+        "devicon-symfony-original",
+        "devicon-travis-plain",
+        "devicon-trello-plain",
+        "devicon-ubuntu-plain",
+        "devicon-vim-plain",
+        "devicon-windows8-original",
+        "devicon-wordpress-plain",
+        "devicon-yii-plain",
+        "devicon-zend-plain"
     ]
 }
diff --git a/src/list-item-component.js b/src/list-item-component.js
@@ -43,11 +43,16 @@ function clickListener(evt) {
         atom.project.getPaths()
     );
 
-    if (serializationFile && atom.storageFolder && typeof atom.storageFolder.storeSync === 'function') {
+    if (
+        !atom.config.get(_utility.getConfig('keepContext')) &&
+        serializationFile &&
+        atom.storageFolder &&
+        typeof atom.storageFolder.storeSync === 'function'
+    ) {
         let serializers = {
+            treeview: _states.treeViewSerialization(),
             project: _states.projectSerialization(),
-            workspace: _states.workspaceSerialization(),
-            treeview: _states.treeViewSerialization()
+            workspace: _states.workspaceSerialization()
         };
 
         atom.storageFolder.storeSync(serializationFile, serializers);
@@ -57,21 +62,13 @@ function clickListener(evt) {
         return;
     }
 
-    // atom.project.getRepositories().forEach((repo) => {
-    //     if (repo && typeof repo.destroy === 'function') {
-    //         repo.destroy();
-    //     }
-    // });
-
-    // atom.workspace.getActivePane().destroy();
-
     serializationFile = atom.getStateKey(model.projectPaths);
 
     if (serializationFile) {
         serialization = atom.storageFolder.load(serializationFile);
     }
 
-    if (serialization) {
+    if (serialization && !atom.config.get(_utility.getConfig('keepContext'))) {
         _states.projectDeserialization(serialization.project);
         _states.workspaceDeserialization(serialization.workspace);
         _states.treeViewDeserialization(serialization.treeview);

diff --git a/src/list-nested-item-component.js b/src/list-nested-item-component.js
@@ -265,7 +265,9 @@ const htmlMethods = {
         let results = children.sort((currentNode, nextNode) => {
             let result;
 
-            if (sort.includes('alphabetically')) {
+            if (sort.includes('alphabetically') &&
+            typeof currentNode.getText === 'function' &&
+            typeof nextNode.getText === 'function') {
                 result = reverse * new Intl.Collator().compare(
                     currentNode.getText(),
                     nextNode.getText()

diff --git a/src/list-tree-component.js b/src/list-tree-component.js
@@ -142,7 +142,10 @@ const htmlMethods = {
         let results = children.sort((currentNode, nextNode) => {
             let result;
 
-            if (sort.includes('alphabetically')) {
+            if (
+              sort.includes('alphabetically') &&
+              typeof currentNode.getText === 'function' &&
+              typeof nextNode.getText === 'function') {
                 result = reverse * new Intl.Collator().compare(
                     currentNode.getText(),
                     nextNode.getText()

diff --git a/src/select-view.js b/src/select-view.js
@@ -83,6 +83,7 @@ class PVSelectListView extends SelectListView {
     }
 
     cancel () {
+        this.filterEditorView.setText('');
         this.hide();
     }
 

diff --git a/src/utilities.js b/src/utilities.js
@@ -158,7 +158,14 @@ const utilities = {
             }
             else if (!changes.hasGroup && !original.parent && !original.root) {
                 Object.setPrototypeOf(original.current, Object.prototype);
-                isANewParent = document.querySelector('ul[is="pv-list-tree"].list-tree.has-collapsable-children')
+                isANewParent = document.querySelector('ul[is="pv-list-tree"].list-tree.has-collapsable-children');
+            }
+            else if (
+                changes.hasOwnProperty('hasClient') &&
+                changes.hasOwnProperty('hasGroup') &&
+                !changes.hasClient && !changes.hasGroup
+            ) {
+              isANewParent = document.querySelector('ul[is="pv-list-tree"].list-tree.has-collapsable-children');
             }
 
             if (isANewParent) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,6 +83,7 @@ class PVSelectListView extends SelectListView { @@
         }
         cancel () {
+            this.filterEditorView.setText('');
             this.hide();
         }
@@ Expand Down @@