[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11949] reflect updated jquery
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11949] reflect updated jquery |
|
Date: |
Tue, 06 May 2014 13:28:56 +0000 |
Revision: 11949
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11949
Author: sigurdne
Date: 2014-05-06 13:28:55 +0000 (Tue, 06 May 2014)
Log Message:
-----------
reflect updated jquery
Modified Paths:
--------------
trunk/controller/inc/class.hook_helper.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/js/controller/ajax_control_to_component.js
trunk/controller/js/controller/ajax_control_to_location.js
trunk/controller/js/controller/case.js
trunk/controller/js/controller/check_list.js
trunk/controller/js/controller/check_list_update_status.js
trunk/controller/js/controller/custom_ui.js
trunk/logistic/js/logistic/resource_allocation.js
trunk/phpgwapi/inc/class.jquery.inc.php
trunk/property/inc/custom/default/BkBygg_editer_system_oversikt.js
trunk/property/js/portico/ajax_dimb_role_user.js
trunk/property/js/portico/ajax_invoice.js
trunk/property/js/portico/ajax_workorder_edit.js
trunk/property/js/yahoo/entity.edit.js
trunk/property/js/yahoo/entity.edit_inventory.js
trunk/registration/js/portico/ajax.js
Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php 2014-05-06 13:27:09 UTC
(rev 11948)
+++ trunk/controller/inc/class.hook_helper.inc.php 2014-05-06 13:28:55 UTC
(rev 11949)
@@ -119,7 +119,7 @@
$script = "<script>";
$script .= "$(document).ready(function(){";
- $script .= " $('.expand_trigger').live('click',
function() {";
+ $script .= " $('.expand_trigger').on('click',
function() {";
$script .= " var liTag = $(this).closest('li'); ";
$script .= " var expandList =
$(liTag).find('.expand_list'); ";
$script .= " if( !$(expandList).hasClass('active') ){
$(expandList).show(); $(expandList).addClass('active'); ";
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2014-05-06 13:27:09 UTC (rev
11948)
+++ trunk/controller/js/controller/ajax.js 2014-05-06 13:28:55 UTC (rev
11949)
@@ -337,7 +337,7 @@
/* ========================= CONTROL OPTION
======================================== */
// SHOW CONTROL OPTION PANEL
- $(".control_item_type").live("click", function(){
+ $(".control_item_type").on("click", function(){
var thisBtn = $(this).find(".btn");
var thisRadio = $(this).find("input[type=radio]");
@@ -365,12 +365,13 @@
});
// DELETE CONTROL OPTION FROM CHOSEN LIST
- $("#control_item_options li .delete").live("click", function(e){
+ $("#control_item_options li .delete").on("click", function(e){
$(this).closest("li").remove();
});
// ADD OPTION VALUE TO OPTION LIST
- $("#add_control_item_list_value input[type=button]").live("click",
function(e){
+ $("#add_control_item_list_value input[type=button]").on("click",
function(e){
+
e.preventDefault();
var listValue =
$(this).parent().find("input[name=option_value]").val();
Modified: trunk/controller/js/controller/ajax_control_to_component.js
===================================================================
--- trunk/controller/js/controller/ajax_control_to_component.js 2014-05-06
13:27:09 UTC (rev 11948)
+++ trunk/controller/js/controller/ajax_control_to_component.js 2014-05-06
13:28:55 UTC (rev 11949)
@@ -312,7 +312,7 @@
});
- $("#acl_form").live("submit", function(e){
+ $("#acl_form").on("submit", function(e){
e.preventDefault();
var control_id = $("#control_id_hidden").val();
Modified: trunk/controller/js/controller/ajax_control_to_location.js
===================================================================
--- trunk/controller/js/controller/ajax_control_to_location.js 2014-05-06
13:27:09 UTC (rev 11948)
+++ trunk/controller/js/controller/ajax_control_to_location.js 2014-05-06
13:28:55 UTC (rev 11949)
@@ -271,7 +271,7 @@
});
- $("#acl_form").live("submit", function(e){
+ $("#acl_form").on("submit", function(e){
e.preventDefault();
var control_id = $("#control_id_hidden").val();
Modified: trunk/controller/js/controller/case.js
===================================================================
--- trunk/controller/js/controller/case.js 2014-05-06 13:27:09 UTC (rev
11948)
+++ trunk/controller/js/controller/case.js 2014-05-06 13:28:55 UTC (rev
11949)
@@ -1,7 +1,7 @@
$(document).ready(function() {
// REGISTER CASE
- $(".frm_register_case").live("submit", function(e) {
+ $(".frm_register_case").on("submit", function(e) {
e.preventDefault();
var thisForm = $(this);
@@ -120,7 +120,7 @@
});
// UPDATE CASE
- $(".frm_update_case").live("submit", function(e) {
+ $(".frm_update_case").on("submit", function(e) {
e.preventDefault();
var thisForm = $(this);
@@ -181,7 +181,7 @@
});
});
- $("a.quick_edit_case").live("click", function(e) {
+ $("a.quick_edit_case").on("click", function(e) {
e.preventDefault();
// console.log("sdfsdfsd");
var clickRow = $(this).closest("li");
@@ -192,7 +192,7 @@
return false;
});
- $(".frm_update_case .cancel").live("click", function(e) {
+ $(".frm_update_case .cancel").on("click", function(e) {
var clickRow = $(this).closest("li");
@@ -203,7 +203,7 @@
});
// DELETE CASE
- $(".delete_case").live("click", function() {
+ $(".delete_case").on("click", function() {
var clickElem = $(this);
var clickRow = $(this).closest("li");
var clickItem = $(this).closest("ul");
@@ -244,7 +244,7 @@
});
// CLOSE CASE
- $(".close_case").live("click", function() {
+ $(".close_case").on("click", function() {
var clickElem = $(this);
var clickRow = $(this).closest("li");
var clickItem = $(this).closest("ul");
@@ -285,7 +285,7 @@
});
// OPEN CASE
- $(".open_case").live("click", function() {
+ $(".open_case").on("click", function() {
var clickElem = $(this);
var clickRow = $(this).closest("li");
var clickItem = $(this).closest("ul");
Modified: trunk/controller/js/controller/check_list.js
===================================================================
--- trunk/controller/js/controller/check_list.js 2014-05-06 13:27:09 UTC
(rev 11948)
+++ trunk/controller/js/controller/check_list.js 2014-05-06 13:28:55 UTC
(rev 11949)
@@ -1,7 +1,7 @@
$(document).ready(function(){
// ADD CHECKLIST
- $("#frm_add_check_list").live("submit", function(e){
+ $("#frm_add_check_list").on("submit", function(e){
var thisForm = $(this);
var statusFieldVal = $("#status").val();
var statusRow = $("#status").closest(".row");
@@ -27,7 +27,7 @@
});
// Display submit button on click
- $("#frm_add_check_list").live("click", function(e){
+ $("#frm_add_check_list").on("click", function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
$(submitBnt).removeClass("not_active");
@@ -36,7 +36,7 @@
// UPDATE CHECKLIST DETAILS
- $("#frm_update_check_list").live("submit", function(e){
+ $("#frm_update_check_list").on("submit", function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
var requestUrl = $(thisForm).attr("action");
Modified: trunk/controller/js/controller/check_list_update_status.js
===================================================================
--- trunk/controller/js/controller/check_list_update_status.js 2014-05-06
13:27:09 UTC (rev 11948)
+++ trunk/controller/js/controller/check_list_update_status.js 2014-05-06
13:28:55 UTC (rev 11949)
@@ -1,7 +1,7 @@
$(document).ready(function() {
// UPDATE CHECKLIST STATUS
- $("#update-check-list-status").live("submit", function(e) {
+ $("#update-check-list-status").on("submit", function(e) {
e.preventDefault();
var thisForm = $(this);
Modified: trunk/controller/js/controller/custom_ui.js
===================================================================
--- trunk/controller/js/controller/custom_ui.js 2014-05-06 13:27:09 UTC (rev
11948)
+++ trunk/controller/js/controller/custom_ui.js 2014-05-06 13:28:55 UTC (rev
11949)
@@ -6,7 +6,7 @@
/* ========================== EXPANDING/COLLAPSING WHEN TITLE IS
CLICKED ====================== */
- $(".expand_list h4").live("click", function(){
+ $(".expand_list h4").on("click", function(){
if( $(this).parent().parent().hasClass('active')){
$(this).parent().find(".expand_item").slideUp("slow");
$(this).find("img").attr("src",
"controller/images/arrow_right.png");
@@ -18,7 +18,7 @@
}
});
- $(".expand-trigger").live("click", function(){
+ $(".expand-trigger").on("click", function(){
var parentNode = $(this).closest("li");
if( $(parentNode).hasClass('expanded')){
@@ -31,4 +31,4 @@
$(parentNode).addClass('expanded');
}
});
-});
\ No newline at end of file
+});
Modified: trunk/logistic/js/logistic/resource_allocation.js
===================================================================
--- trunk/logistic/js/logistic/resource_allocation.js 2014-05-06 13:27:09 UTC
(rev 11948)
+++ trunk/logistic/js/logistic/resource_allocation.js 2014-05-06 13:28:55 UTC
(rev 11949)
@@ -1,6 +1,6 @@
$(document).ready(function(){
- $("#requirement-container table tr").live("click", function(e){
+ $("#requirement-container table tr").on("click", function(e){
var thisRow = $(this);
var requirement_id =
$(thisRow).find("td.requirement_id").find("div").text();
@@ -8,7 +8,7 @@
updateAllocationTable( requirement_id );
});
- $("#allocation-container table .btn-sm.delete").live("click",
function(e){
+ $("#allocation-container table .btn-sm.delete").on("click", function(e){
var thisRow = $(this).parents("tr");
var requestUrl = $(this).attr("href");
Modified: trunk/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jquery.inc.php 2014-05-06 13:27:09 UTC (rev
11948)
+++ trunk/phpgwapi/inc/class.jquery.inc.php 2014-05-06 13:28:55 UTC (rev
11949)
@@ -58,31 +58,33 @@
switch ( $widget )
{
case 'core':
- $load =
array("js/jquery-1.7.2{$_type}");
+ $load = array
+ (
+ "js/jquery-1.11.1{$_type}",
+ "js/jquery-migrate-1.2.1"
+ );
break;
case 'datepicker':
- $load =
array("js/jquery-1.7.2{$_type}", "js/jquery-ui-1.8.19.custom{$_type}",
"development-bundle/ui/i18n/jquery.ui.datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}");
+ $load = array
+ (
+ "js/jquery-1.11.1{$_type}",
+
"js/jquery-ui-1.10.4.custom{$_type}",
+
"development-bundle/ui/i18n/jquery.ui.datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}",
+ "js/jquery-migrate-1.2.1"
+ );
break;
+ case 'menu':
case 'autocomplete':
-/*
$load = array
(
- "js/jquery-1.7.2{$_type}",
-
'development-bundle/ui/minified/jquery.ui.core.min',
-
'development-bundle/ui/minified/jquery.ui.widget.min',
-
'development-bundle/ui/minified/jquery.ui.position.min',
-
'development-bundle/ui/minified/jquery.ui.autocomplete.min'
+ "js/jquery-1.11.1{$_type}",
+
"js/jquery-ui-1.10.4.custom{$_type}",
+ "js/jquery-migrate-1.2.1"
);
-*/
- $load = array
- (
- "js/jquery-1.7.2{$_type}",
-
"js/jquery-ui-1.8.19.custom{$_type}"
- );
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.8.19.custom.css');
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.10.4.custom{$_type}.css");
break;
@@ -105,4 +107,5 @@
}
return "phpgroupware.{$widget}" . ++self::$counter;
}
+
}
Modified: trunk/property/inc/custom/default/BkBygg_editer_system_oversikt.js
===================================================================
--- trunk/property/inc/custom/default/BkBygg_editer_system_oversikt.js
2014-05-06 13:27:09 UTC (rev 11948)
+++ trunk/property/inc/custom/default/BkBygg_editer_system_oversikt.js
2014-05-06 13:28:55 UTC (rev 11949)
@@ -95,7 +95,7 @@
});
- $("#form").live("submit", function(e){
+ $("#form").on("submit", function(e){
var error = false;
if( !$("#id_konf_1").prop('checked') &&
(!$("#id_konf_2").prop('checked') && !$("#id_konf_3").prop('checked') &&
!$("#id_konf_4").prop('checked')))
Modified: trunk/property/js/portico/ajax_dimb_role_user.js
===================================================================
--- trunk/property/js/portico/ajax_dimb_role_user.js 2014-05-06 13:27:09 UTC
(rev 11948)
+++ trunk/property/js/portico/ajax_dimb_role_user.js 2014-05-06 13:28:55 UTC
(rev 11949)
@@ -21,7 +21,7 @@
update_dimb_role_user_table();
});
- $("#acl_form").live("submit", function(e){
+ $("#acl_form").on("submit", function(e){
e.preventDefault();
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js 2014-05-06 13:27:09 UTC (rev
11948)
+++ trunk/property/js/portico/ajax_invoice.js 2014-05-06 13:28:55 UTC (rev
11949)
@@ -86,7 +86,7 @@
});
});
- $("#approve_line").live("click", function(e){
+ $("#approve_line").on("click", function(e){
$("#receipt").html('');
var line_id = $(this).val();
var voucher_id_orig = $("#voucher_id").val();
@@ -113,7 +113,7 @@
});
});
- $("#voucher_form").live("submit", function(e){
+ $("#voucher_form").on("submit", function(e){
e.preventDefault();
var line_id = $("#line_id").val();
var voucher_id_orig = $("#voucher_id").val();
Modified: trunk/property/js/portico/ajax_workorder_edit.js
===================================================================
--- trunk/property/js/portico/ajax_workorder_edit.js 2014-05-06 13:27:09 UTC
(rev 11948)
+++ trunk/property/js/portico/ajax_workorder_edit.js 2014-05-06 13:28:55 UTC
(rev 11949)
@@ -23,7 +23,7 @@
});
- $("#workorder_edit").live("submit", function(e){
+ $("#workorder_edit").on("submit", function(e){
if($("#lean").val() == 0)
{
@@ -102,7 +102,7 @@
});
});
- $("#workorder_cancel").live("submit", function(e){
+ $("#workorder_cancel").on("submit", function(e){
if($("#lean").val() == 0)
{
return;
Modified: trunk/property/js/yahoo/entity.edit.js
===================================================================
--- trunk/property/js/yahoo/entity.edit.js 2014-05-06 13:27:09 UTC (rev
11948)
+++ trunk/property/js/yahoo/entity.edit.js 2014-05-06 13:28:55 UTC (rev
11949)
@@ -231,7 +231,7 @@
// jquery
$(document).ready(function(){
- $("#edit_inventory").live("submit", function(e){
+ $("#edit_inventory").on("submit", function(e){
e.preventDefault();
@@ -306,7 +306,7 @@
});
});
- $("#workorder_cancel").live("submit", function(e){
+ $("#workorder_cancel").on("submit", function(e){
if($("#lean").val() == 0)
{
return;
Modified: trunk/property/js/yahoo/entity.edit_inventory.js
===================================================================
--- trunk/property/js/yahoo/entity.edit_inventory.js 2014-05-06 13:27:09 UTC
(rev 11948)
+++ trunk/property/js/yahoo/entity.edit_inventory.js 2014-05-06 13:28:55 UTC
(rev 11949)
@@ -1,7 +1,7 @@
// jquery
$(document).ready(function(){
- $("#edit_inventory").live("submit", function(e){
+ $("#edit_inventory").on("submit", function(e){
e.preventDefault();
@@ -75,7 +75,7 @@
});
});
- $("#workorder_cancel").live("submit", function(e){
+ $("#workorder_cancel").on("submit", function(e){
if($("#lean").val() == 0)
{
return;
Modified: trunk/registration/js/portico/ajax.js
===================================================================
--- trunk/registration/js/portico/ajax.js 2014-05-06 13:27:09 UTC (rev
11948)
+++ trunk/registration/js/portico/ajax.js 2014-05-06 13:28:55 UTC (rev
11949)
@@ -181,7 +181,7 @@
});
/*
-$(".choose_loc").live( "change", function () {
+$(".choose_loc").on( "change", function () {
var thisSelectBox = $(this);
var loc_code = $(this).val();
var loc_id = $(this).attr("id");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11949] reflect updated jquery,
Sigurd Nes <=