[Fmsystem-commits] [15938] prepare for jquery 3

[sigurdne]

Revision: 15938
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15938
Author:   sigurdne
Date:     2016-11-02 11:43:03 +0000 (Wed, 02 Nov 2016)
Log Message:
-----------
prepare for jquery 3

Modified Paths:
--------------
    trunk/calendar/templates/base/contacts_popup.tpl
    trunk/phpgwapi/templates/portico/head.inc.php
    trunk/phpgwapi/templates/pure/head.inc.php
    trunk/phpgwapi/templates/simple/head.inc.php

Modified: trunk/calendar/templates/base/contacts_popup.tpl
===================================================================
--- trunk/calendar/templates/base/contacts_popup.tpl    2016-11-02 11:29:45 UTC 
(rev 15937)
+++ trunk/calendar/templates/base/contacts_popup.tpl    2016-11-02 11:43:03 UTC 
(rev 15938)
@@ -4,7 +4,6 @@
                <title>{lang_title}</title>
                <script type="text/javascript" 
src="{webserver_url}/phpgwapi/js/core/base.js"></script>
                <script type="text/javascript" 
src="{webserver_url}/phpgwapi/js/core/events.js"></script>
-       <!--<script type="text/javascript" 
src="{webserver_url}/phpgwapi/js/json/json.js"></script> -->
                <script type="text/javascript" 
src="{webserver_url}/phpgwapi/js/sarissa/sarissa.js"></script>
                <script type="text/javascript">
 

Modified: trunk/phpgwapi/templates/portico/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/head.inc.php       2016-11-02 11:29:45 UTC 
(rev 15937)
+++ trunk/phpgwapi/templates/portico/head.inc.php       2016-11-02 11:43:03 UTC 
(rev 15938)
@@ -23,11 +23,6 @@
        phpgw::import_class('phpgwapi.jquery');
        phpgwapi_jquery::load_widget('core');
 
-       $javascripts = array
-       (
-               "/phpgwapi/js/json/json.js"
-       );
-
        if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
        {
                $javascripts[] = "/phpgwapi/templates/portico/js/base.js";

Modified: trunk/phpgwapi/templates/pure/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/pure/head.inc.php  2016-11-02 11:29:45 UTC (rev 
15937)
+++ trunk/phpgwapi/templates/pure/head.inc.php  2016-11-02 11:43:03 UTC (rev 
15938)
@@ -2,8 +2,6 @@
        $javascripts = array();
        $stylesheets = array();
 
-       $javascripts[] = "/phpgwapi/js/json/json.js";
-
        phpgw::import_class('phpgwapi.jquery');
        phpgwapi_jquery::load_widget('core');
 

Modified: trunk/phpgwapi/templates/simple/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/simple/head.inc.php        2016-11-02 11:29:45 UTC 
(rev 15937)
+++ trunk/phpgwapi/templates/simple/head.inc.php        2016-11-02 11:43:03 UTC 
(rev 15938)
@@ -32,9 +32,7 @@
 
                $javascripts = array
                (
-                       "/phpgwapi/js/json/json.js",
                        "/phpgwapi/templates/portico/js/base.js"
-
                );
 
                $stylesheets[] = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/base.css";