mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00
Code Issues Releases Wiki Activity

jQuery upgraded to the latest and greatest 2.1.1; fixed calls to obsolete live() in all core js libraries

Browse Source
This commit is contained in:
SecretR
2014-11-04 16:12:18 +02:00
parent 0650acbf6c
commit adc1f826b8
7 changed files with 79 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_handlers/js_manager.php
View File

@@ -43,7 +43,8 @@ class e_jsmanager
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/base/jquery-ui.css", // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/themes/base/jquery-ui.css",
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"
// "http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js", // "http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js",
"http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js" // "http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"
"http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"
// , // ,
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js", // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js",
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css", // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css",

7
e107_plugins/featurebox/templates/featurebox_category_template.php
View File

@@ -318,9 +318,10 @@ $FEATUREBOX_CATEGORY_TEMPLATE['camera']['nav_item'] = ''; // <li><a href="#tab-{
$FEATUREBOX_CATEGORY_TEMPLATE['camera']['nav_end'] = ''; // </ul>'; $FEATUREBOX_CATEGORY_TEMPLATE['camera']['nav_end'] = ''; // </ul>';
$FEATUREBOX_CATEGORY_TEMPLATE['camera']['nav_separator'] = ''; $FEATUREBOX_CATEGORY_TEMPLATE['camera']['nav_separator'] = '';
$FEATUREBOX_CATEGORY_TEMPLATE['camera']['js'] = '{e_WEB_JS}camera/scripts/camera.min.js'; // Depracated camera.js, need replacement
$FEATUREBOX_CATEGORY_TEMPLATE['camera']['js_inline'] = "$('.camera_wrap').camera({FEATUREBOX_PARMS});"; //$FEATUREBOX_CATEGORY_TEMPLATE['camera']['js'] = '{e_WEB_JS}camera/scripts/camera.min.js';
$FEATUREBOX_CATEGORY_TEMPLATE['camera']['js_type'] = 'jquery'; //$FEATUREBOX_CATEGORY_TEMPLATE['camera']['js_inline'] = "$('.camera_wrap').camera({FEATUREBOX_PARMS});";
//$FEATUREBOX_CATEGORY_TEMPLATE['camera']['js_type'] = 'jquery';

1
e107_web/js/camera/scripts/camera.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
e107_web/js/core/admin.jquery.js
View File

@@ -148,7 +148,7 @@ $(document).ready(function()
/* InfoPanel Comment approval and deletion */ /* InfoPanel Comment approval and deletion */
$("button[data-comment-action]").live("click", function(){ $(document).on("click", "button[data-comment-action]", function(){
var url = $(this).attr("data-target"); var url = $(this).attr("data-target");
var action = $(this).attr('data-comment-action'); var action = $(this).attr('data-comment-action');
@@ -360,7 +360,7 @@ $(document).ready(function()
// $(".e-spinner").spinner(); //FIXME breaks tooltips etc. // $(".e-spinner").spinner(); //FIXME breaks tooltips etc.
$(".e-alert").live("click", function(){ $(document).on("click", ".e-alert", function(){
var message = $(this).html(); var message = $(this).html();
alert(message); alert(message);

4
e107_web/js/core/all.jquery.js
View File

@@ -444,11 +444,11 @@ $(document).ready(function()
*/ */
$(".e-dialog-close").live("click", function(){ $(document).on("click", ".e-dialog-close", function(){
parent.$('.modal').modal('hide'); parent.$('.modal').modal('hide');
// parent.$.colorbox.close() // parent.$.colorbox.close()
}); });

44
e107_web/js/core/front.jquery.js
View File

@@ -35,7 +35,7 @@ $(document).ready(function()
$(".e-comment-submit").live("click", function(){ $(document).on("click", ".e-comment-submit", function(){
var url = $(this).attr("data-target"); var url = $(this).attr("data-target");
var sort = $(this).attr("data-sort"); var sort = $(this).attr("data-sort");
@@ -102,7 +102,7 @@ $(document).ready(function()
$(".e-comment-reply").live("click", function(){ $(document).on("click", ".e-comment-reply", function(){
var url = $(this).attr("data-target"); var url = $(this).attr("data-target");
var table = $(this).attr("data-type"); var table = $(this).attr("data-type");
@@ -133,7 +133,7 @@ $(document).ready(function()
}); });
return false; return false;
}); });
@@ -142,27 +142,27 @@ $(document).ready(function()
$(".e-comment-edit").live("click", function(){ $(document).on("click", ".e-comment-edit", function(){
var url = $(this).attr("data-target"); var url = $(this).attr("data-target");
var sp = $(this).attr('id').split("-"); var sp = $(this).attr('id').split("-");
var id = "#comment-" + sp[3] + "-edit"; var id = "#comment-" + sp[3] + "-edit";
if($('.e-comment-edit-save').length != 0) //prevent creating save button twice. if($('.e-comment-edit-save').length != 0) //prevent creating save button twice.
{ {
return false; return false;
} }
$(id).attr('contentEditable',true); $(id).attr('contentEditable',true);
$(id).after("<div class='e-comment-edit-save'><input data-target='"+url+"' id='e-comment-edit-save-"+sp[3]+"' class='button btn btn-success e-comment-edit-save' type='button' value='Save' /></div>"); $(id).after("<div class='e-comment-edit-save'><input data-target='"+url+"' id='e-comment-edit-save-"+sp[3]+"' class='button btn btn-success e-comment-edit-save' type='button' value='Save' /></div>");
$('div.e-comment-edit-save').hide().fadeIn(800); $('div.e-comment-edit-save').hide().fadeIn(800);
$(id).addClass("e-comment-edit-active"); $(id).addClass("e-comment-edit-active");
$(id).focus(); $(id).focus();
return false; return false;
}); });
$("input.e-comment-edit-save").live("click", function(){ $("form").on("click", "input.e-comment-edit-save", function(){
var url = $(this).attr("data-target"); var url = $(this).attr("data-target");
var sp = $(this).attr('id').split("-"); var sp = $(this).attr('id').split("-");
@@ -219,7 +219,7 @@ $(document).ready(function()
$(".e-comment-delete").live("click", function(){ $(document).on("click", ".e-comment-delete", function(){
var url = $(this).attr("data-target"); var url = $(this).attr("data-target");
var sp = $(this).attr('id').split("-"); var sp = $(this).attr('id').split("-");
@@ -246,7 +246,7 @@ $(document).ready(function()
}); });
$(".e-comment-approve").live("click", function(){ $(document).on("click", ".e-comment-approve", function() {
var url = $(this).attr("data-target"); var url = $(this).attr("data-target");
var sp = $(this).attr('id').split("-"); var sp = $(this).attr('id').split("-");
@@ -287,7 +287,7 @@ $(document).ready(function()
$(".e-rate-thumb").live("click", function(){ $(document).on("click", ".e-rate-thumb", function(){
var src = $(this).attr("href"); var src = $(this).attr("href");
var thumb = $(this); var thumb = $(this);

4
e107_web/js/core/mediaManager.js
View File

@@ -113,7 +113,7 @@ $(document).ready(function()
// $(".e-media-select").click(function () { // $(".e-media-select").click(function () {
$(".e-media-select").live("click", function(){ $(document).on("click", ".e-media-select", function(){
// console.log(this); // console.log(this);
@@ -242,7 +242,7 @@ $(document).ready(function()
// Must be defined after e-media-select // Must be defined after e-media-select
$(".e-dialog-save").live("click", function(){// FIXME TODO missing caret , text selection overwrite etc. $(document).on("click", ".e-dialog-save", function(){// FIXME TODO missing caret , text selection overwrite etc.
var newval = $('#bbcode_holder').val(); var newval = $('#bbcode_holder').val();
var target = $(this).attr('data-target'); var target = $(this).attr('data-target');