fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16483] remove obselete


From: sigurdne
Subject: [Fmsystem-commits] [16483] remove obselete
Date: Sun, 26 Mar 2017 04:57:57 -0400 (EDT)

Revision: 16483
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16483
Author:   sigurdne
Date:     2017-03-26 04:57:57 -0400 (Sun, 26 Mar 2017)
Log Message:
-----------
remove obselete

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.jquery.inc.php
    trunk/phpgwapi/js/jquery/common.js
    trunk/phpgwapi/templates/base/datatable_inline.xsl
    trunk/property/templates/base/wo_hour.index.xsl

Modified: trunk/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jquery.inc.php     2017-03-25 22:09:58 UTC (rev 
16482)
+++ trunk/phpgwapi/inc/class.jquery.inc.php     2017-03-26 08:57:57 UTC (rev 
16483)
@@ -463,10 +463,7 @@
                        $js = <<<JS
                $(document).ready(function ()
                {
-                       /*if(typeof(JqueryPortico.inlineTablesDefined) == 
'undefined' || JqueryPortico.inlineTablesDefined == 0)
-                       {*/
-                               JqueryPortico.render_tabs();
-                       //}
+                       JqueryPortico.render_tabs();
                });
 
                        JqueryPortico.render_tabs = function ()

Modified: trunk/phpgwapi/js/jquery/common.js
===================================================================
--- trunk/phpgwapi/js/jquery/common.js  2017-03-25 22:09:58 UTC (rev 16482)
+++ trunk/phpgwapi/js/jquery/common.js  2017-03-26 08:57:57 UTC (rev 16483)
@@ -8,10 +8,6 @@
 ;
 var JqueryPortico = {};
 
-/* Sigurd: Need to delay tab-rendering to after all tables are finished*/
-JqueryPortico.inlineTablesDefined = 0;
-JqueryPortico.inlineTablesRendered = 0;
-
 JqueryPortico.parseURL = function (url)
 {
        var parser = document.createElement('a'),
@@ -394,7 +390,6 @@
        }
 //     $(document).ready(function ()
 //     {
-       JqueryPortico.inlineTablesRendered += 1;
 
        var oTable = $("#" + container).dataTable({
                paginate: disablePagination ? false : true,
@@ -440,19 +435,6 @@
                },
                fnInitComplete: function (oSettings, json)
                {
-                       /*if(JqueryPortico.inlineTablesRendered == 
JqueryPortico.inlineTablesDefined)
-                        {
-                        if(typeof(JqueryPortico.render_tabs) == 'function')
-                        {
-                        var delay=15;//allow extra 350 milliseconds to really 
finish
-                        setTimeout(function()
-                        {
-                        JqueryPortico.render_tabs();
-                        alert(JqueryPortico.inlineTablesRendered);
-
-                        },delay);
-                        }
-                        }*/
                },
                lengthMenu: lengthMenu,
                pageLength: pageLength,
@@ -507,7 +489,6 @@
                        }
                        try
                        {
-//                             window['local_DrawCallback' + 
JqueryPortico.inlineTablesRendered](oTable);
                                window['local_DrawCallback' + num](oTable);
                        }
                        catch (err)

Modified: trunk/phpgwapi/templates/base/datatable_inline.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_inline.xsl  2017-03-25 22:09:58 UTC 
(rev 16482)
+++ trunk/phpgwapi/templates/base/datatable_inline.xsl  2017-03-26 08:57:57 UTC 
(rev 16483)
@@ -269,7 +269,6 @@
                        </xsl:when>
        </xsl:choose>
                        
-               JqueryPortico.inlineTablesDefined += 1;
                var PreColumns = [
                        <xsl:for-each select="$ColumnDefs">
                                {

Modified: trunk/property/templates/base/wo_hour.index.xsl
===================================================================
--- trunk/property/templates/base/wo_hour.index.xsl     2017-03-25 22:09:58 UTC 
(rev 16482)
+++ trunk/property/templates/base/wo_hour.index.xsl     2017-03-26 08:57:57 UTC 
(rev 16483)
@@ -215,11 +215,6 @@
        </table>
        <script>
 
-               if (JqueryPortico.inlineTablesRendered == 0)
-               {
-               JqueryPortico.inlineTablesRendered = 1;
-               }
-               
                var columns = [
                <xsl:for-each select="//datatable/field">
                        {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]