Skip to content

Commit

Permalink
release 3.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
xjsender committed Jul 18, 2015
1 parent c011b3a commit da6af63
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 23 deletions.
6 changes: 6 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Release History

---------------

Release 3.1.3 (2015-07-18)
++++++++++++++++++
* Fix issue #54
* Fix issue #56


Release 3.1.2 (2015-07-17)
++++++++++++++++++
* Fix issue #55
Expand Down
5 changes: 5 additions & 0 deletions config/commands/main.sublime-commands
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@
"command": "deploy_file_to_server"
},

{
"caption": "HaoIDE: Deploy to This Server",
"command": "deploy_file_to_this_server"
},

{
"caption": "HaoIDE: Destruct from Server",
"command": "destruct_file_from_server"
Expand Down
6 changes: 1 addition & 5 deletions config/keymap/Default (Linux).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@
},

// Deploy to this server
{"keys": ["alt+shift+s"], "command": "deploy_file_to_server",
"args": {
"switch": false
}
},
{"keys": ["alt+shift+s"], "command": "deploy_file_to_this_server"},

// Update the default project
{"keys": ["alt+f7"], "command": "update_project"},
Expand Down
6 changes: 1 addition & 5 deletions config/keymap/Default (OSX).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@
},

// Deploy to this server
{"keys": ["shift+command+s"], "command": "deploy_file_to_server",
"args": {
"switch": false
}
},
{"keys": ["shift+command+s"], "command": "deploy_file_to_this_server"},

// Update the default project
{"keys": ["alt+r"], "command": "update_project"},
Expand Down
6 changes: 1 addition & 5 deletions config/keymap/Default (Windows).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@
},

// Deploy to this server
{"keys": ["alt+shift+s"], "command": "deploy_file_to_server",
"args": {
"switch": false
}
},
{"keys": ["alt+shift+s"], "command": "deploy_file_to_this_server"},

// Update the default project
{"keys": ["alt+r"], "command": "update_project"},
Expand Down
6 changes: 1 addition & 5 deletions config/menus/Context.sublime-menu
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
// {"caption": "Rename from Server", "command": "rename_metadata"},

{"caption": "Deploy to Server", "command": "deploy_file_to_server"},
{"caption": "Deploy to This Server", "command": "deploy_file_to_server",
"args": {
"switch": false
}
},
{"caption": "Deploy to This Server", "command": "deploy_file_to_this_server"},

{"caption": "Deploy Lighting Element to Server", "command": "deploy_lighting_element_to_server"},

Expand Down
6 changes: 6 additions & 0 deletions config/messages/3.1.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Build 3.1.3
-----------
Release Date: 18 July 2015

* Fix issue #54
* Fix issue #56
2 changes: 1 addition & 1 deletion config/settings/package.sublime-settings
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "HaoIDE",
"version": "3.1.2",
"version": "3.1.3",
"description": "HaoIDE is a Sublime Text 3 plugin for Salesforce and used for swift development on Force.com",
"author": "Hao Liu",
"email": "[email protected]",
Expand Down
12 changes: 11 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ def is_enabled(self):
# Must be class or trigger
attributes = util.get_file_attributes(self.view.file_name())
if not attributes["extension"]: return False
if attributes["extension"] not in [".cls", ".trigger"]: return False
if attributes["extension"] not in ["cls", "trigger"]: return False

# Can't be Test Class
self.body = open(self.view.file_name(), encoding="utf-8").read()
Expand Down Expand Up @@ -877,6 +877,16 @@ def is_enabled(self):

return True

class DeployFileToThisServer(sublime_plugin.TextCommand):
def run(self, edit):
files = [self.view.file_name()]
sublime.active_window().run_command("deploy_files_to_server", {
"files": files, "switch": False
})

def is_enabled(self):
return util.check_enabled(self.view.file_name(), check_cache=False)

class DeployFilesToServer(sublime_plugin.WindowCommand):
def __init__(self, *args, **kwargs):
super(DeployFilesToServer, self).__init__(*args, **kwargs)
Expand Down
1 change: 1 addition & 0 deletions messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
"3.1.0": "config/messages/3.1.0.md",
"3.1.1": "config/messages/3.1.1.md",
"3.1.2": "config/messages/3.1.2.md",
"3.1.3": "config/messages/3.1.3.md",
"install": "config/messages/install.txt"
}
2 changes: 1 addition & 1 deletion util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2368,7 +2368,7 @@ def check_enabled(file_name, check_cache=True):

# Check whether project of current file is active project
default_project_name = settings["default_project_name"]
if not default_project_name.lower() in file_name.lower():
if default_project_name.lower() not in file_name.lower():
sublime.status_message('This project is not active project');
return False

Expand Down

1 comment on commit da6af63

@xjsender
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix issue #56 , #54

Please sign in to comment.