Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[39604] trunk

[Marc L. <ma...@ma...>]

This solves the UTF-8 display bug in IE8 and IE9?

Thanks!
On 2012-01-20 6:54 PM, <ch...@us...> wrote:

> Revision: 39604
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39604&view=rev
> Author:   chealer
> Date:     2012-01-20 23:54:28 +0000 (Fri, 20 Jan 2012)
> Log Message:
> -----------
> [REF] Upload file: remove trivial function progress()
>
> Modified Paths:
> --------------
>    trunk/lib/filegals/filegallib.php
>    trunk/templates/tiki-upload_file.tpl
>
> Modified: trunk/lib/filegals/filegallib.php
> ===================================================================
> --- trunk/lib/filegals/filegallib.php   2012-01-20 23:43:13 UTC (rev
> 39603)
> +++ trunk/lib/filegals/filegallib.php   2012-01-20 23:54:28 UTC (rev
> 39604)
> @@ -2708,7 +2708,7 @@
>                                echo '<?xml version="1.0"
> encoding="UTF-8"?'.'>';
>                                ob_flush();
>                                echo "<script
> type='text/javascript'><!--//--><![CDATA[//><!--\n";
> -                               echo "parent.progress('$id','" .
> smarty_modifier_escape($msg, 'javascript', 'UTF-8') . "');\n";
> +                               echo "parent.$('#progress_'+$id).html('" .
> smarty_modifier_escape($msg, 'javascript', 'UTF-8') . "');\n";
>                                echo "//--><!]]></script>\n";
>                        }
>                        ob_flush();
>
> Modified: trunk/templates/tiki-upload_file.tpl
> ===================================================================
> --- trunk/templates/tiki-upload_file.tpl        2012-01-20 23:43:13 UTC
> (rev 39603)
> +++ trunk/templates/tiki-upload_file.tpl        2012-01-20 23:54:28 UTC
> (rev 39604)
> @@ -528,17 +528,13 @@
>                                nb_upload += 1;
>                        }
>
> -                       function progress(id,msg) {
> -
> document.getElementById('progress_'+id).innerHTML = msg;
> -                       }
> -
>                        function do_submit(n) {
>                                if
> (document.forms['file_'+n].elements['userfile[]'].value != '') {
> -                                       progress(n,"<img
> src='img/spinner.gif'>{tr}Uploading file...{/tr}");
> +                                       $('#progress_'+n).html("<img
> src='img/spinner.gif'>{tr}Uploading file...{/tr}");
>
>  document.getElementById('file_'+n).submit();
>
>  document.getElementById('file_'+n).reset();
>                                } else {
> -                                       progress(n,"{tr}No File to
> Upload...{/tr} <span class='button'><a href='#'
> onClick='location.replace(location.href);return
> false;'>{tr}Retry{/tr}</a></span>");
> +                                       $('#progress_'+n).html("{tr}No
> File to Upload...{/tr} <span class='button'><a href='#'
> onClick='location.replace(location.href);return
> false;'>{tr}Retry{/tr}</a></span>");
>                                }
>                        }
>
>
> This was sent by the SourceForge.net collaborative development platform,
> the world's largest Open Source development site.
>
>
>
> ------------------------------------------------------------------------------
> Try before you buy = See our experts in action!
> The most comprehensive online learning library for Microsoft developers
> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
> Metro Style Apps, more. Free future releases when you subscribe now!
> http://p.sf.net/sfu/learndevnow-dev2
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>