wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Sebastian Lackner : ole32: Call GetClipboardFormatName with the correct parameters.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 182fad8b3a99ac3aa9dc19a3ed2954202010a274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182fad8b3a99ac3aa9dc19a3e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 3 09:41:04 2017 +0100 ole32: Call GetClipboardFormatName with the correct parameters. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 6e4dd44..faec553 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1199,7 +1199,7 @@ static HRESULT get_priv_data(ole_priv_data **data) for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) { WCHAR buf[256]; - if (GetClipboardFormatNameW(cf, buf, sizeof(buf))) + if (GetClipboardFormatNameW(cf, buf, sizeof(buf) / sizeof(WCHAR))) TRACE("cf %04x %s\n", cf, debugstr_w(buf)); else TRACE("cf %04x\n", cf);

1 0

Michael Müller : msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: ea7cc6fc553ba25fe8acfc6d5a694c54cdbf9c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7cc6fc553ba25fe8acfc6d5… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 3 09:36:45 2017 +0100 msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 28f126c..d390020 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -771,6 +771,9 @@ static struct msvideo_thunk* MSVIDEO_HasThunk(HIC16 hic) { struct msvideo_thunk* thunk; + if (!MSVIDEO_Thunks) + return NULL; + for (thunk = MSVIDEO_Thunks; thunk < &MSVIDEO_Thunks[MAX_THUNKS]; thunk++) { if (thunk->hIC16 == hic) return thunk;

1 0

Sebastian Lackner : ntdll: Mark ZwLoadKey2 export as private.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: beab000a534ddbb8520cd0ba006505b726cf3dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beab000a534ddbb8520cd0ba0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 3 09:28:05 2017 +0100 ntdll: Mark ZwLoadKey2 export as private. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4cbc3b0..6e99af9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1123,7 +1123,7 @@ # @ stub ZwIsSystemResumeAutomatic @ stdcall -private ZwListenPort(ptr ptr) NtListenPort @ stdcall -private ZwLoadDriver(ptr) NtLoadDriver -@ stdcall ZwLoadKey2(ptr ptr long) NtLoadKey2 +@ stdcall -private ZwLoadKey2(ptr ptr long) NtLoadKey2 @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile # @ stub ZwLockProductActivationKeys

1 0

Ken Thomases : winemac: Reattach OpenGL contexts to a view after it has been hidden and unhidden.
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: 2128125cbfe2893e65b1093b583b15084261f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2128125cbfe2893e65b1093b5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 2 15:16:27 2017 -0600 winemac: Reattach OpenGL contexts to a view after it has been hidden and unhidden. Hiding a view seems to semi-detach any attached OpenGL contexts such that rendering no longer works. There's no GL surface for the view. Calling -[NSOpenGLContext update] is not sufficient to reattach the context. So, fully detach the contexts and reattach them. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.h | 2 ++ dlls/winemac.drv/cocoa_opengl.m | 15 +++++++++++++-- dlls/winemac.drv/cocoa_window.m | 35 ++++++++++++++++++++++++++++------- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.h b/dlls/winemac.drv/cocoa_opengl.h index e7e1686..bcd257f 100644 --- a/dlls/winemac.drv/cocoa_opengl.h +++ b/dlls/winemac.drv/cocoa_opengl.h @@ -25,12 +25,14 @@ { NSView* latentView; BOOL needsUpdate; + BOOL needsReattach; BOOL shouldClearToBlack; GLint backing_size[2]; } @property BOOL needsUpdate; +@property BOOL needsReattach; @property BOOL shouldClearToBlack; @end diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index debeb78..5a097a1 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -35,7 +35,7 @@ @implementation WineOpenGLContext -@synthesize latentView, needsUpdate, shouldClearToBlack; +@synthesize latentView, needsUpdate, needsReattach, shouldClearToBlack; - (void) dealloc { @@ -215,6 +215,7 @@ [self setLatentView:nil]; } needsUpdate = FALSE; + needsReattach = FALSE; } @end @@ -279,6 +280,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v, CGRect if (context.needsUpdate) { context.needsUpdate = FALSE; + context.needsReattach = FALSE; if (context.view) [context setView:[[context class] dummyView]]; [context wine_updateBackingSize:&r.size]; @@ -328,7 +330,9 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) if (context.needsUpdate) { + BOOL reattach = context.needsReattach; context.needsUpdate = FALSE; + context.needsReattach = FALSE; if (context.latentView) { [context setView:context.latentView]; @@ -339,7 +343,14 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) } else { - [context update]; + if (reattach) + { + NSView* view = [[context.view retain] autorelease]; + [context clearDrawableLeavingSurfaceOnScreen]; + context.view = view; + } + else + [context update]; [context resetSurfaceIfBackingSizeChanged]; } } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 57587d9..118bf3c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -500,10 +500,19 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [(WineWindow*)[self window] updateForGLSubviews]; } - - (void) updateGLContexts + - (void) updateGLContexts:(BOOL)reattach { for (WineOpenGLContext* context in glContexts) + { context.needsUpdate = TRUE; + if (reattach) + context.needsReattach = TRUE; + } + } + + - (void) updateGLContexts + { + [self updateGLContexts:NO]; } - (BOOL) hasGLContext @@ -605,6 +614,23 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return NO; } + - (void) viewDidHide + { + [super viewDidHide]; + if ([self hasGLContext]) + [self invalidateHasGLDescendant]; + } + + - (void) viewDidUnhide + { + [super viewDidUnhide]; + if ([self hasGLContext]) + { + [self updateGLContexts:YES]; + [self invalidateHasGLDescendant]; + } + } + - (void) completeText:(NSString*)text { macdrv_event* event; @@ -651,12 +677,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super willRemoveSubview:subview]; } - - (void) setHidden:(BOOL)hidden - { - [super setHidden:hidden]; - [self invalidateHasGLDescendant]; - } - /* * ---------- NSTextInputClient methods ---------- */ @@ -3432,6 +3452,7 @@ void macdrv_set_view_hidden(macdrv_view v, int hidden) OnMainThreadAsync(^{ [view setHidden:hidden]; + [(WineWindow*)view.window updateForGLSubviews]; }); [pool release];

1 0

Ken Thomases : winemac: Ignore clipboard updates provoked by our own call to GetClipboardData().
by Alexandre Julliard 03 Feb '17

03 Feb '17

Module: wine Branch: master Commit: c95d2de3dd41d1da6fb96191dfb74b7a412ba362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95d2de3dd41d1da6fb96191d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 2 14:51:45 2017 -0600 winemac: Ignore clipboard updates provoked by our own call to GetClipboardData(). During a call to GetClipboardData(), the app may be asked to render the data for a promised format. This will cause us to receive WM_CLIPBOARDUPDATE. Almost always, the app will have just rendered the requested format and not made any other changes. Therefore, we don't need to rebuild the Mac pasteboard from the Win32 clipboard. Doing so can cause a race with the other Mac app which is querying the pasteboard (for a paste operation, for example). We basically delete the data we _just_ added and rebuild the list of available types. The symptom is that the other Mac app sees the available types change and maybe be incomplete. In theory, the Windows app could make other changes to the clipboard and this change would cause us to fail to convey them to the Mac pasteboard. I consider that very unlikely and the tradeoff to improve the common case is worth it. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 7115c3b..53f01d5 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -200,6 +200,7 @@ static BOOL is_clipboard_owner; static macdrv_window clipboard_cocoa_window; static UINT rendered_formats; static ULONG64 last_clipboard_update; +static DWORD last_get_seqno; static WINE_CLIPFORMAT **current_mac_formats; static unsigned int nb_current_mac_formats; static WCHAR clipboard_pipe_name[256]; @@ -1819,6 +1820,7 @@ static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM return TRUE; case WM_CLIPBOARDUPDATE: if (is_clipboard_owner) break; /* ignore our own changes */ + if ((LONG)(GetClipboardSequenceNumber() - last_get_seqno) <= 0) break; set_mac_pasteboard_types_from_win32_clipboard(); break; case WM_RENDERFORMAT: @@ -2220,6 +2222,8 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) } } + last_get_seqno = GetClipboardSequenceNumber(); + CloseClipboard(); return ret;

1 0

Jeremy Newman : instead of outputting debug, put in the console
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: 569f2eb2c95acb4ef4f04ba6673bedf66a40cb57 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=569f2eb2c95acb4ef4f04ba6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:16:31 2017 -0600 instead of outputting debug, put in the console --- admin/editAppFamily.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php index 6531fb4..a04b7a5 100644 --- a/admin/editAppFamily.php +++ b/admin/editAppFamily.php @@ -31,13 +31,16 @@ else $oApp = new Application($aClean['iAppId']); - + if(!$oApp) { util_show_error_page_and_exit('Application does not exist'); } - - if($_SESSION['current']->showDebuggingInfos()) { echo "<p align=center><b>appName:</b> $oApp->sName </p>"; } + + if($_SESSION['current']->showDebuggingInfos()) + { + appdb_debug("appName: {$oApp->sName}"); + } apidb_header("Edit Application Family");

1 0

Jeremy Newman : remove xinha, add wysiwyg class to load editor
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: 8f6be98e4e0fc51b60d6ff514404d404608f0d7e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f6be98e4e0fc51b60d6ff51… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:06:11 2017 -0600 remove xinha, add wysiwyg class to load editor --- include/application.php | 4 +--- include/filter.php | 5 +---- include/note.php | 4 +--- include/testData.php | 8 +++----- include/version.php | 3 +-- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/include/application.php b/include/application.php index 376b459..75d13ee 100644 --- a/include/application.php +++ b/include/application.php @@ -565,8 +565,6 @@ class Application { /* output a html table and this applications values to the fields for editing */ public function outputEditor($sVendorName = "") { - HtmlAreaLoaderScript(array("app_editor")); - echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">'; /* Used to distinguish between the first step of entering an application @@ -638,7 +636,7 @@ class Application { echo '<td><input size="75%" type="text" name="sAppKeywords" value="'.$this->sKeywords.'"></td></tr>',"\n"; echo '<tr valign=top><td class="color0"><b>Application description (In your own words)</b></td>',"\n"; - echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription">'; + echo '<td><p><textarea cols="80" rows="20" id="app_editor" name="shAppDescription" class="wysiwyg">'; echo $this->sDescription.'</textarea></p></td></tr>',"\n"; diff --git a/include/filter.php b/include/filter.php index aa3fa6d..ec4c0b7 100644 --- a/include/filter.php +++ b/include/filter.php @@ -31,14 +31,11 @@ function filter_gpc() // Special cases for variables that don't fit our filtering scheme // don't filter the AppDB session cookie and MAX_FILE_SIZE - // and the DialogX values that xinha uses // NOTE: we must use === when comparing the return value of strpos // against a value, otherwise if strpos() returns false indicating that // the value wasn't found strpos(something) == 0 will still be true - if((strpos($aKeys[$i], "Dialog") === 0) || - (strpos($aKeys[$i], "XinhaColorPicker") === 0) || // Xinha variables - ($aKeys[$i] == "cx") || // google custom search variable + if(($aKeys[$i] == "cx") || // google custom search variable ($aKeys[$i] == "cof") || // google custom search variable ($aKeys[$i] == "q") || // google custom search variable ($aKeys[$i] == "g-recaptcha-response")) // google reCaptcha variable diff --git a/include/note.php b/include/note.php index 0e43cce..8a9dabd 100644 --- a/include/note.php +++ b/include/note.php @@ -382,8 +382,6 @@ class Note { $this->iAppId = $oVersion->iAppId; } - HtmlAreaLoaderScript(array("editor")); - echo html_frame_start("Edit Application Note", "90%","",0); echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'"); @@ -401,7 +399,7 @@ class Note { echo '</td></tr>'; echo '<tr><td class=color1>Description</td><td class=color0>', "\n"; echo '<p style="width:700px">', "\n"; - echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc">'.$this->shDescription.'</textarea>',"\n"; + echo '<textarea cols="80" rows="20" id="editor" name="shNoteDesc" class="wysiwyg">'.$this->shDescription.'</textarea>',"\n"; echo '</p>'; echo '</td></tr>'."\n"; diff --git a/include/testData.php b/include/testData.php index 18a04b4..8ba45c1 100644 --- a/include/testData.php +++ b/include/testData.php @@ -834,8 +834,6 @@ class testData{ if(!$this->sTestedDate) $this->sTestedDate = date('Y-m-d H:i:s'); - HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); - $sName = version::fullName($this->iVersionId); echo html_frame_start("Test Form - $sName", "90%", "", 0); @@ -843,15 +841,15 @@ class testData{ // What works echo '<tr valign=top><td class="color0"><b>What works</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test1" name="shWhatWorks" class="wysiwyg">'; echo $this->shWhatWorks.'</textarea></p></td></tr>',"\n"; // What Does not work echo '<tr valign=top><td class=color1><b>What does not work</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">'; echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n"; // What was not tested echo '<tr valign=top><td class=color0><b>What was not tested</b></td>',"\n"; - echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested">'; + echo '<td class="color0"><p><textarea cols="80" rows="20" id="Test3" name="shWhatNotTested" class="wysiwyg">'; echo $this->shWhatNotTested.'</textarea></p></td></tr>',"\n"; // Date Tested echo '<tr valign=top><td class="color1"><b>Date tested </b></td>',"\n"; diff --git a/include/version.php b/include/version.php index 2e34d1a..b79954d 100644 --- a/include/version.php +++ b/include/version.php @@ -595,7 +595,6 @@ class version { /* otherwise, if $editParentAppliation is false, we leave them out */ public function outputEditor() { - HtmlAreaLoaderScript(array("version_editor")); echo html_frame_start("Version Form", "90%", "", 0); echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'; @@ -669,7 +668,7 @@ class version { $oTableCell->SetClass("color0"); $oTableRow->AddCell($oTableCell); - $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription">'. + $oTableRow->AddTextCell('<p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription" class="wysiwyg">'. $this->sDescription.'</textarea></p>'); $oTable->AddRow($oTableRow);

1 0

Jeremy Newman : remove xinha editor loader
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: c364568a9e53ff09c45f327b6b556b12dc6c43e4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c364568a9e53ff09c45f327b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:05:58 2017 -0600 remove xinha editor loader --- include/util.php | 217 ------------------------------------------------------- 1 file changed, 217 deletions(-) diff --git a/include/util.php b/include/util.php index 367179d..6626027 100644 --- a/include/util.php +++ b/include/util.php @@ -603,223 +603,6 @@ function Simplify($dirs, $idx) } // End of snippet of code copied from php.net -// Use the directory of PHP_SELF and BASE and the relative path -// to get a simplified path to an appdb directory or file -// Used for the Xinha _editor_url because some plugins like SpellChecker -// won't work with relative paths like ../xinha -function GetSimplifiedPath($relative) -{ - return "/".SimplifyPath(dirname($_SERVER['PHP_SELF'])."/".BASE.$relative); -} - -function HtmlAreaLoaderScript($aTextareas) -{ - static $outputIndex = 0; - - /* Check if the user wants to display the HTML editor (always, for supported browsers or never) */ - switch($_SESSION['current']->getPref('htmleditor', 'for supported browsers')) - { - case 'never': - return; - case 'for supported browsers': - // Xinha 0.96.1 tested fine in Opera 11.6 & Konqueror 4.7.2 - break; - case 'always': - break; - } - - echo ' - <script type="text/javascript">'; - // You must set _editor_url to the URL (including trailing slash) where - // where xinha is installed, it's highly recommended to use an absolute URL - // eg: _editor_url = "/path/to/xinha/"; - // You may try a relative URL if you wish] - // eg: _editor_url = "../"; - // in this example we do a little regular expression to find the absolute path. - // NOTE: we use GetSimplifiedPath() because we cannot use a relative path and have - // all of the plugins work correctly. Specifically the SpellChecker plugin - // requires a absolute url path to the xinha directory - echo ' - _editor_url = "'.GetSimplifiedPath("xinha/").'", \'\'; - _editor_lang = "en"; // And the language we need to use in the editor. - </script>'; - - echo ' -  - <script type="text/javascript" src="'.BASE.'xinha/XinhaCore.js"></script> - - <script type="text/javascript"> - xinha_editors_'.$outputIndex.' = null; - xinha_init_'.$outputIndex.' = null;'; - - /* only need to nll out the first set of config and plugins */ - /* as we will reuse these for additional htmlareas */ - if($outputIndex == 0) - { - echo ' - xinha_config_'.$outputIndex.' = null; - xinha_plugins_'.$outputIndex.' = null;'; - } - - echo ' - // This contains the names of textareas we will make into Xinha editors - xinha_init_'.$outputIndex.' = xinha_init_'.$outputIndex.' ? xinha_init_'.$outputIndex.' : function() - {'; - - /** STEP 1 *************************************************************** - * First, what are the plugins you will be using in the editors on this - * page. List all the plugins you will need, even if not all the editors - * will use all the plugins. - ************************************************************************/ - if($outputIndex == 0) - { - echo ' - xinha_plugins_'.$outputIndex.' = xinha_plugins_'.$outputIndex.' ? xinha_plugins_'.$outputIndex.' : - [ - \'CharacterMap\', - \'CharCounter\', - \'ContextMenu\', - \'FullPage\', - \'ListType\', - \'SpellChecker\', - \'Stylist\', - \'SuperClean\', - \'TableOperations\', - \'DynamicCSS\', - \'FindReplace\' - ]; - - // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING :) - if(!HTMLArea.loadPlugins(xinha_plugins_'.$outputIndex.', xinha_init_'.$outputIndex.')) return;'; - } else - { - echo ' - // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING :) - if(!HTMLArea.loadPlugins(xinha_plugins_0, xinha_init_'.$outputIndex.')) return;'; - } - - /** STEP 2 *************************************************************** - * Now, what are the names of the textareas you will be turning into - * editors? - ************************************************************************/ - - // NOTE: we generate the editor names here so we can easily have any number of htmlarea editors - // and can reuse all of this code - echo ' - xinha_editors_'.$outputIndex.' = xinha_editors_'.$outputIndex.' ? xinha_editors_'.$outputIndex.' : - ['; - - $firstEntry = true; - foreach($aTextareas as $key=>$value) - { - if($firstEntry) - { - echo "'$value'"; - $firstEntry = false; - } else - { - echo ", '$value'"; - } - } - - echo ' - ];'; - - /** STEP 3 *************************************************************** - * We create a default configuration to be used by all the editors. - * If you wish to configure some of the editors differently this will be - * done in step 5. - * - * If you want to modify the default config you might do something like this. - * - * xinha_config = new HTMLArea.Config(); - * xinha_config.width = \'640px\'; - * xinha_config.height = \'420px\'; - * - *************************************************************************/ - /* We only need the configuration output for the first htmlarea on a given page */ - if($outputIndex == 0) - { - echo ' - xinha_config_'.$outputIndex.' = new HTMLArea.Config(); - - xinha_config_'.$outputIndex.'.toolbar = [ - ["popupeditor"], - ["separator","fontsize","bold","italic","underline","strikethrough"], - ["separator","forecolor","hilitecolor","textindicator"], - ["separator","subscript","superscript"], - ["linebreak","separator","justifyleft","justifycenter","justifyright","justifyfull"], - ["separator","insertorderedlist","insertunorderedlist","outdent","indent"], - ["separator","inserthorizontalrule","createlink","inserttable"], - ["separator","undo","redo","selectall"], (HTMLArea.is_gecko ? [] : ["cut","copy","paste","overwrite","saveas"]), - ["separator","killword","removeformat","toggleborders","lefttoright", "righttoleft","separator","htmlmode","about"] - ]; - - xinha_config_'.$outputIndex.'.pageStyle = "@import url('.BASE."application.css".');"; - '; - } - - /** STEP 4 *************************************************************** - * We first create editors for the textareas. - * - * You can do this in two ways, either - * - * xinha_editors = HTMLArea.makeEditors(xinha_editors, xinha_config, xinha_plugins); - * - * if you want all the editor objects to use the same set of plugins, OR; - * - * xinha_editors = HTMLArea.makeEditors(xinha_editors, xinha_config); - * xinha_editors['myTextArea'].registerPlugins(['Stylist','FullScreen']); - * xinha_editors['anotherOne'].registerPlugins(['CSS','SuperClean']); - * - * if you want to use a different set of plugins for one or more of the - * editors. - ************************************************************************/ - - echo ' - xinha_editors_'.$outputIndex.' = HTMLArea.makeEditors(xinha_editors_'.$outputIndex.', - xinha_config_0, xinha_plugins_0);'; - - /** STEP 5 *************************************************************** - * If you want to change the configuration variables of any of the - * editors, this is the place to do that, for example you might want to - * change the width and height of one of the editors, like this... - * - * xinha_editors.myTextArea.config.width = '640px'; - * xinha_editors.myTextArea.config.height = '480px'; - * - ************************************************************************/ - - - /** STEP 6 *************************************************************** - * Finally we "start" the editors, this turns the textareas into - * Xinha editors. - ************************************************************************/ - echo ' - HTMLArea.startEditors(xinha_editors_'.$outputIndex.'); - }'; - - if($outputIndex != 0) - { - echo ' - var old_on_load_'.$outputIndex.' = window.onload; - window.onload = function() { - if (typeof old_on_load_'.$outputIndex.' == "function") old_on_load_'.$outputIndex.'(); - xinha_init_'.$outputIndex.'(); - }'; - } else - { - echo ' - window.onload = xinha_init_'.$outputIndex.';'; - } - - echo ' - </SCRIPT> - '; - - $outputIndex++; /* increment the output index */ -} - /** * Cuts the link text to the specified number of chars if it's longer, * and adds an ellipsis

1 0

Jeremy Newman : add loader for wysiwyg editor fields
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: 5988d57b8b176303a9b3ac4a6f56d3a543717396 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5988d57b8b176303a9b3ac4a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:04:14 2017 -0600 add loader for wysiwyg editor fields * using redactor and codemirror * add dynamic css and js loader funcs * import sWebRoot from main website for paths --- js/utils.js | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 114 insertions(+), 14 deletions(-) diff --git a/js/utils.js b/js/utils.js index 204428e..d23e964 100644 --- a/js/utils.js +++ b/js/utils.js @@ -7,6 +7,110 @@ console.log('Welcome to the %cWineHQ%c AppDB', 'color: #490708; font-size: 48pt; font-style: italic; font-weight: bold;', 'color: #95493A; font-size: 48pt; font-style: italic; font-weight: bold;'); +/* + * jQuery old style toggle replacement + * this useful object was removed in jquery 1.9 + */ +$.fn.toggleClick = function(){ + var functions = arguments ; + return this.click(function(){ + var iteration = $(this).data('iteration') || 0; + functions[iteration].apply(this, arguments); + iteration = (iteration + 1) % functions.length ; + $(this).data('iteration', iteration); + }); +}; + +// load javascript file +// note: to force reload of js code, touch the dir +(function($){ + $.check_and_require=function(file,callback) + { + var full_path = sWebRoot + "js/" + file + '.js'; + var options = { + dataType: 'script', + cache: true, + async: false, + url: full_path, + success: callback + }; + $.ajax(options); + } +})(jQuery); + +// load css file once (use CDN if enabled) +var loadedCSS = []; +(function($){ + $.load_css_once=function(file) + { + if ($.inArray(file,loadedCSS) == -1) { + $('<link rel="stylesheet" type="text/css" href="' + sWebRoot + 'css/' + file + '.css" />').appendTo("head"); + loadedCSS.push(file); + } + } +})(jQuery); + +/* + * Load our preferred wysiwyg editor on a field + redactor II: http://imperavi.com/redactor/ + */ +(function($){ + $.fn.whq_wysiwyg = function () + { + // save this + var t = this; + + // calculate height + var iHeight = ($(t).attr("rows") ? ($(t).attr("rows") * 15) + 'px' : $(t).css('height')); + + // default redactor opts + var redactor_opts = { + minHeight: iHeight, + maxHeight: iHeight, + toolbarFixed: false, + focus: false, + overrideStyles: false, + pastePlainText: true, + dragImageUpload: false, + clipboardImageUpload: false, + multipleImageUpload: false, + imageResizable: true, + imagePosition: true, + imageCaption: true, + imageTag: 'figure', + script: false, + plugins: ['codemirror','alignment','table','fontcolor','fontfamily','fontsize','fullscreen','iconic'], + buttons: ['fullscreen', 'html', 'format', 'bold', 'italic', 'underline', 'deleted', + 'table', 'lists', 'alignment', 'horizontalrule','image', 'link'], + buttonsHideOnMobile: ['image','table'], + codemirror: { + lineNumbers: true, + lineWrapping: true, + mode: 'htmlmixed', + indentUnit: 4 + } + }; + + // load and execute codemirror + $.check_and_require('codemirror', function() + { + // load css + $.load_css_once('codemirror'); + $.load_css_once('redactor'); + + // load and execute redactor + $.check_and_require("redactor.min", function() + { + // load redactor on field + $(t).redactor(redactor_opts); + }); + }); + + // return calling object + return this; + } +})(jQuery); + // execute on when document ready $(document).ready(function() { @@ -79,6 +183,12 @@ $(document).ready(function() }); }); + // wysiwyg HTML editor + $("textarea.wysiwyg").each(function() + { + $(this).whq_wysiwyg(); + }); + // remove alert messages by clicking $("#whq-alert").click(function(){ $(this).fadeOut("slow"); }); @@ -92,20 +202,10 @@ $(document).ready(function() { $('div#dlogp').slideUp(); }); -}); -/* - * jQuery old style toggle replacement - * this useful object was removed in jquery 1.9 - */ -$.fn.toggleClick = function(){ - var functions = arguments ; - return this.click(function(){ - var iteration = $(this).data('iteration') || 0; - functions[iteration].apply(this, arguments); - iteration = (iteration + 1) % functions.length ; - $(this).data('iteration', iteration); - }); -}; + // HTML editor (redactor loader) + + +}); // done \ No newline at end of file

1 0

Jeremy Newman : adding redactor HTML editor and with codemirror
by Jeremy Newman 03 Feb '17

03 Feb '17

Module: appdb Branch: master Commit: 9cd734dceb24538f1da8d0c80aff6c032bf152ab URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9cd734dceb24538f1da8d0c8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 3 11:03:31 2017 -0600 adding redactor HTML editor and with codemirror --- css/codemirror.css | 40 ++++++++++++++++++++++++++++++++++++++++ css/redactor.css | 26 ++++++++++++++++++++++++++ js/codemirror.js | 10 ++++++++++ js/redactor.min.js | 7 +++++++ 4 files changed, 83 insertions(+) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=9cd734dceb24538f1da8…

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017