From e8f4c4a9e16b0747647cc914c13d7597800b108d Mon Sep 17 00:00:00 2001 From: Bibiko Date: Sun, 12 Dec 2010 13:32:48 +0000 Subject: =?UTF-8?q?=E2=80=A2=20HTML=20output=20window's=20JavaScript=20sup?= =?UTF-8?q?port=20-=20changed=20the=20approach=20to=20make=20the=20HTML=20?= =?UTF-8?q?output=20window=20the=20key=20window;=20now=20it=20could=20be?= =?UTF-8?q?=20done=20directly=20via=20a=20JavaScript=20command:=20window.s?= =?UTF-8?q?ystem.makeHTMLOutputWindowKeyWindow()=20-=20added=20the=20chanc?= =?UTF-8?q?e=20to=20ask=20Sequel=20Pro=20via=20JavaScript=20for=20run-time?= =?UTF-8?q?=20shell=20variables=20via=20window.system.getShellEnvironmentF?= =?UTF-8?q?orName('shell=5Fvar=5Fname')=20=E2=80=A2=20more=20usage=20of=20?= =?UTF-8?q?constants?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPBundleEditorController.m | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/SPBundleEditorController.m') diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m index 272221d4..034200b1 100644 --- a/Source/SPBundleEditorController.m +++ b/Source/SPBundleEditorController.m @@ -344,6 +344,7 @@ @"SP_SELECTED_ROW_INDICES", @"SP_SELECTED_TABLE", @"SP_SELECTED_TABLES", + @"SP_SELECTED_TEXT", @"SP_USED_QUERY_FOR_TABLE", nil ] retain]; -- cgit v1.2.3 From b2015bc3974c04557492bb4a698776824ab6689d Mon Sep 17 00:00:00 2001 From: Bibiko Date: Sun, 12 Dec 2010 19:20:57 +0000 Subject: =?UTF-8?q?=E2=80=A2=20made=20usage=20of=20more=20constants=20to?= =?UTF-8?q?=20avoid=20double-storing=20strings=20=E2=80=A2=20fixed=20JavaS?= =?UTF-8?q?cript=20alert=20and=20confirm=20window=20in=20HTML=20output=20w?= =?UTF-8?q?indow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPBundleEditorController.m | 85 ++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 42 deletions(-) (limited to 'Source/SPBundleEditorController.m') diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m index 034200b1..dffcb20c 100644 --- a/Source/SPBundleEditorController.m +++ b/Source/SPBundleEditorController.m @@ -304,48 +304,49 @@ [commandBundleTreeController setSortDescriptors:[NSArray arrayWithObjects:sortDescriptor, nil]]; shellVariableSuggestions = [[NSArray arrayWithObjects: - @"SP_ALL_DATABASES", - @"SP_ALL_FUNCTIONS", - @"SP_ALL_PROCEDURES", - @"SP_ALL_TABLES", - @"SP_ALL_VIEWS", - @"SP_APP_RESOURCES_DIRECTORY", - @"SP_BUNDLE_EXIT_INSERT_AS_SNIPPET", - @"SP_BUNDLE_EXIT_INSERT_AS_TEXT", - @"SP_BUNDLE_EXIT_NONE", - @"SP_BUNDLE_EXIT_REPLACE_CONTENT", - @"SP_BUNDLE_EXIT_REPLACE_SELECTION", - @"SP_BUNDLE_EXIT_SHOW_AS_HTML", - @"SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP", - @"SP_BUNDLE_EXIT_SHOW_AS_TEXT_TOOLTIP", - @"SP_BUNDLE_INPUT", - @"SP_BUNDLE_INPUT_TABLE_METADATA", - @"SP_BUNDLE_PATH", - @"SP_BUNDLE_SCOPE", - @"SP_CURRENT_EDITED_COLUMN_NAME", - @"SP_CURRENT_EDITED_TABLE", - @"SP_CURRENT_HOST", - @"SP_CURRENT_LINE", - @"SP_CURRENT_PORT", - @"SP_CURRENT_QUERY", - @"SP_CURRENT_USER", - @"SP_CURRENT_WORD", - @"SP_DATA_TABLE_SOURCE", - @"SP_DATABASE_ENCODING", - @"SP_ICON_FILE", - @"SP_PROCESS_ID", - @"SP_QUERY_FILE", - @"SP_QUERY_RESULT_FILE", - @"SP_QUERY_RESULT_META_FILE", - @"SP_QUERY_RESULT_STATUS_FILE", - @"SP_RDBMS_TYPE", - @"SP_RDBMS_VERSION", - @"SP_SELECTED_DATABASE", - @"SP_SELECTED_ROW_INDICES", - @"SP_SELECTED_TABLE", - @"SP_SELECTED_TABLES", - @"SP_SELECTED_TEXT", - @"SP_USED_QUERY_FOR_TABLE", + SPBundleShellVariableAllDatabases, + SPBundleShellVariableAllFunctions, + SPBundleShellVariableAllProcedures, + SPBundleShellVariableAllTables, + SPBundleShellVariableAllViews, + SPBundleShellVariableAppResourcesDirectory, + SPBundleShellVariableBlobFileDirectory, + SPBundleShellVariableExitInsertAsSnippet, + SPBundleShellVariableExitInsertAsText, + SPBundleShellVariableExitNone, + SPBundleShellVariableExitReplaceContent, + SPBundleShellVariableExitReplaceSelection, + SPBundleShellVariableExitInsertAsHTML, + SPBundleShellVariableExitInsertAsHTMLTooltip, + SPBundleShellVariableExitInsertAsTextTooltip, + SPBundleShellVariableInputFilePath, + SPBundleShellVariableInputTableMetaData, + SPBundleShellVariableBundlePath, + SPBundleShellVariableBundleScope, + SPBundleShellVariableCurrentEditedColumnName, + SPBundleShellVariableCurrentEditedTable, + SPBundleShellVariableCurrentHost, + SPBundleShellVariableCurrentLine, + SPBundleShellVariableCurrentPort, + SPBundleShellVariableCurrentQuery, + SPBundleShellVariableCurrentUser, + SPBundleShellVariableCurrentWord, + SPBundleShellVariableDataTableSource, + SPBundleShellVariableDatabaseEncoding, + SPBundleShellVariableIconFile, + SPBundleShellVariableProcessID, + SPBundleShellVariableQueryFile, + SPBundleShellVariableQueryResultFile, + SPBundleShellVariableQueryResultMetaFile, + SPBundleShellVariableQueryResultStatusFile, + SPBundleShellVariableRDBMSType, + SPBundleShellVariableRDBMSVersion, + SPBundleShellVariableSelectedDatabase, + SPBundleShellVariableSelectedRowIndices, + SPBundleShellVariableSelectedTable, + SPBundleShellVariableSelectedTables, + SPBundleShellVariableSelectedText, + SPBundleShellVariableUsedQueryForTable, nil ] retain]; -- cgit v1.2.3