Skip to content

Commit fc94b86

Browse files
committed
add toggler to disable custom sort order, rename settings file
1 parent c2f0279 commit fc94b86

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

CSScomb.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def __init__(self, view):
2020

2121
def run(self, edit):
2222
self.sortorder = False
23-
self.order_settings = sublime.load_settings('CSScomb - Order.sublime-settings')
24-
if self.order_settings:
23+
self.order_settings = sublime.load_settings('CSScomb.sublime-settings')
24+
if self.order_settings.has('custom_sort_order') and self.order_settings.get('custom_sort_order') == True:
2525
self.sortorder = self.order_settings.get('sort_order')
2626
sublime.status_message('Sorting with custom sort order...')
2727

CSScomb - Order.sublime-settings renamed to CSScomb.sublime-settings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"custom_sort_order": false,
23
"sort_order": [
34
"position",
45
"top",

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ To customize it do following:
4444
3. Open user-defined sort order: `Preferences``Package Settings``CSScomb``Sort Order – User`
4545
4. Paste in this file.
4646
5. Change order how you want.
47+
6. Set `custom_sort_order` value to `true`
4748

4849
## Issues & bugs
4950

csscomb/localsort.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ def check_php_on_path(self):
2525

2626
def exec_request(self):
2727
if not self.error:
28-
order = '["' + '","'.join(self.sortorder) + '"]'
29-
myprocess = subprocess.Popen(['php', csscomb_path, self.original, order], shell=False, stdout=subprocess.PIPE, startupinfo=self.startupinfo)
28+
if self.sortorder != False:
29+
order = '["' + '","'.join(self.sortorder) + '"]'
30+
myprocess = subprocess.Popen(['php', csscomb_path, self.original, order], shell=False, stdout=subprocess.PIPE, startupinfo=self.startupinfo)
31+
else:
32+
myprocess = subprocess.Popen(['php', csscomb_path, self.original, ''], shell=False, stdout=subprocess.PIPE, startupinfo=self.startupinfo)
3033
(sout, serr) = myprocess.communicate()
3134
myprocess.wait()
3235

0 commit comments

Comments
 (0)