diff --git a/Extensions/CRov.sex b/Extensions/CRov.sex index f53a339..45f4c12 100644 --- a/Extensions/CRov.sex +++ b/Extensions/CRov.sex @@ -244,7 +244,7 @@ var s: TStringList; begin a := TMenuItem(Sender).Hint; - Delete(a, Length(a) - Length('.'+Extension) + 1, Length('.'+Extension)); + Delete(a, Length(a) - Length('.' + Extension) + 1, Length('.' + Extension)); SplitRecoverInfo(a, a, b, c); if (not ForceSave) then @@ -252,7 +252,7 @@ begin s := TStringList.Create; try s.LoadFromFile(TMenuItem(Sender).Hint); - OpenScript(a, s.Text); + OpenScript(a, s.Text, False); finally s.Free; end; diff --git a/Extensions/paster.sex b/Extensions/paster.sex index f4a157d..6568c8a 100644 --- a/Extensions/paster.sex +++ b/Extensions/paster.sex @@ -92,7 +92,7 @@ begin end; WriteLn('Opening Paste #' + GetJSONValue(Data, 'paste_id') + ' in a new tab!'); - OpenScript('Paste #' + GetJSONValue(Data, 'paste_id'), GetJSONValue(Data, 'code')); + OpenScript('Paste #' + GetJSONValue(Data, 'paste_id'), GetJSONValue(Data, 'code'), False); Result := True; end; end; diff --git a/Projects/Simba/psextension.pas b/Projects/Simba/psextension.pas index d09a6dd..f8c83d5 100644 --- a/Projects/Simba/psextension.pas +++ b/Projects/Simba/psextension.pas @@ -192,8 +192,8 @@ begin AddFunction(@ext_MessageDlg,'function MessageDlg(const aCaption, aMsg: string; DlgType: TMsgDlgType;Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer;'); AddFunction(@ext_InputQuery,'function InputQuery(const ACaption, APrompt : String; var Value : String) : Boolean;'); AddFunction(@ext_ScriptText,'function ScriptText: string;'); - AddFunction(@ext_OpenScript,'procedure OpenScript(Name, Data: string);'); - AddFunction(@ext_OpenScriptEx,'procedure OpenScriptEx(FileName: string);'); + AddFunction(@ext_OpenScript,'procedure OpenScript(Name, Data: string; Run: boolean);'); + AddFunction(@ext_OpenScriptEx,'procedure OpenScriptEx(FileName: string; Run: boolean);'); AddRegisteredPTRVariable('Settings','TMMLSettingsSandbox'); AddFunction(@ext_GetPageEx,'function GetPageEx(const URL, PostData, MimeType: string): string;'); AddFunction(@ext_GetJSONValue,'function GetJSONValue(const Data, Value: string): string;'); diff --git a/Units/MMLAddon/PSInc/Wrappers/extensions.inc b/Units/MMLAddon/PSInc/Wrappers/extensions.inc index ab1ba48..3e0d1ce 100644 --- a/Units/MMLAddon/PSInc/Wrappers/extensions.inc +++ b/Units/MMLAddon/PSInc/Wrappers/extensions.inc @@ -129,10 +129,10 @@ begin Result := ReplaceRegExpr('([N|n][A|a][M|m][E|e]|[P|p][A|a][S|s]{2}|[P|p][I|i][N|n])\s*\:\=\s*\''.*?\'';', Result, '$1 := ''*********'';', True); end; -procedure ext_OpenScript(Name, Data: string); +procedure ext_OpenScript(vName, Data: string; Run: boolean); begin - if (Name = '') then - Name := 'Untitled'; + if (vName = '') then + vName := 'Untitled'; with SimbaForm do begin @@ -140,14 +140,18 @@ begin with CurrScript do begin SynEdit.Lines.Text := Data; - ScriptName := Name; + ScriptName := vName; + ScriptChanged := True; end; RefreshTab(); UpdateTitle(); end; + + if (Run) then + SimbaForm.RunScript(); end; -procedure ext_OpenScriptEx(FileName: string); +procedure ext_OpenScriptEx(FileName: string; Run: boolean); begin FileName := SetDirSeparators(FileName); with SimbaForm do @@ -164,6 +168,9 @@ begin RefreshTab(); UpdateTitle(); end; + + if (Run) then + SimbaForm.RunScript(); end; function ext_GetPageEx(const URL, PostData, MimeType: string): string;