• made usage of more constants to avoid double-storing strings

• fixed JavaScript alert and confirm window in HTML output window

1 files changed, 43 insertions, 42 deletions

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];