mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-16 15:19:06 +00:00
[upgrade jquery] modifications, & cleaned up code & files
This commit is contained in:
@@ -94,7 +94,7 @@ define([
|
||||
|
||||
this.currentView = this.dashboardView;
|
||||
|
||||
$('#info-bar .close').click(Common.closeTopNoticeBar);
|
||||
$('#info-bar .close').on('click', Common.closeTopNoticeBar);
|
||||
},
|
||||
|
||||
switchCurrentView: function(newView) {
|
||||
|
@@ -123,7 +123,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -123,7 +123,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -78,7 +78,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -99,7 +99,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -86,7 +86,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -34,7 +34,7 @@ define([
|
||||
$form.modal()
|
||||
$('#simplemodal-container').css({'width':'auto', 'height':'auto'});
|
||||
|
||||
$form.submit(function(){
|
||||
$form.on('submit', function(){
|
||||
var $submitBtn = $('add-ip-form-btn', $form);
|
||||
var ipaddress = $.trim($('#ipaddress', $form).val());
|
||||
var $error = $('.error', $form);
|
||||
@@ -57,7 +57,7 @@ define([
|
||||
error: function(collection, response, options) {
|
||||
var err_msg;
|
||||
if (response.responseText) {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
} else {
|
||||
err_msg = gettext('Please check the network.');
|
||||
}
|
||||
@@ -110,7 +110,7 @@ define([
|
||||
error: function(collection, response, opts){
|
||||
var err_msg;
|
||||
if (response.responseText) {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
}
|
||||
|
@@ -76,7 +76,7 @@ define([
|
||||
form.modal({appendTo:'#main'});
|
||||
$('#simplemodal-container').css({'height':'auto'});
|
||||
|
||||
form.submit(function() {
|
||||
form.on('submit', function() {
|
||||
var obj_name = $.trim($('input[name="name"]', form).val());
|
||||
if (!obj_name) {
|
||||
Common.showFormError(form_id, gettext("It is required."));
|
||||
@@ -189,7 +189,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -82,7 +82,7 @@ define([
|
||||
error: function(xhr) {
|
||||
var err_msg;
|
||||
if (xhr.responseText) {
|
||||
var parsed_resp = $.parseJSON(xhr.responseText);
|
||||
var parsed_resp = JSON.parse(xhr.responseText);
|
||||
err_msg = parsed_resp.error||parsed_resp.error_msg;
|
||||
err_msg = Common.HTMLescape(err_msg);
|
||||
} else {
|
||||
@@ -131,7 +131,7 @@ define([
|
||||
error: function (xhr) {
|
||||
var err_msg;
|
||||
if (xhr.responseText) {
|
||||
var parsed_resp = $.parseJSON(xhr.responseText);
|
||||
var parsed_resp = JSON.parse(xhr.responseText);
|
||||
err_msg = parsed_resp.error||parsed_resp.error_msg;
|
||||
err_msg = Common.HTMLescape(err_msg);
|
||||
} else {
|
||||
|
@@ -66,7 +66,7 @@ define([
|
||||
error: function(xhr) {
|
||||
var err_msg;
|
||||
if (xhr.responseText) {
|
||||
err_msg = $.parseJSON(xhr.responseText).error_msg;
|
||||
err_msg = JSON.parse(xhr.responseText).error_msg;
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
}
|
||||
|
@@ -41,7 +41,7 @@ define([
|
||||
placeholder: gettext("Search user or enter email and press Enter")
|
||||
}));
|
||||
|
||||
$form.submit(function() {
|
||||
$form.on('submit', function() {
|
||||
var group_id = _this.groupMemberCollection.group_id;
|
||||
var emails = $.trim($('[name="email"]', $form).val());
|
||||
var $error = $('.error', $form);
|
||||
@@ -151,7 +151,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -69,7 +69,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -75,7 +75,7 @@ define([
|
||||
formatSelectionTooBig: gettext("You cannot select any more choices")
|
||||
}));
|
||||
|
||||
$form.submit(function() {
|
||||
$form.on('submit', function() {
|
||||
var email = $.trim($('[name="email"]', $(this)).val());
|
||||
var $submitBtn = $('[type="submit"]', $(this));
|
||||
|
||||
@@ -103,7 +103,7 @@ define([
|
||||
error: function(xhr) {
|
||||
var error_msg;
|
||||
if (xhr.responseText) {
|
||||
error_msg = $.parseJSON(xhr.responseText).error_msg;
|
||||
error_msg = JSON.parse(xhr.responseText).error_msg;
|
||||
} else {
|
||||
error_msg = gettext("Failed. Please check the network.");
|
||||
}
|
||||
|
@@ -69,7 +69,7 @@ define([
|
||||
formatSelectionTooBig: gettext("You cannot select any more choices")
|
||||
}));
|
||||
|
||||
$form.submit(function() {
|
||||
$form.on('submit', function() {
|
||||
var group_name = $.trim($('[name="group_name"]', $form).val());
|
||||
var group_owner = $.trim($('[name="group_owner"]', $form).val());
|
||||
var $error = $('.error', $form);
|
||||
@@ -162,7 +162,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -100,7 +100,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -6,13 +6,12 @@ define([
|
||||
'moment',
|
||||
'simplemodal',
|
||||
'select2',
|
||||
'jquery.ui.tabs',
|
||||
'sysadmin-app/views/share',
|
||||
'app/views/dialogs/repo-history-settings',
|
||||
'app/views/widgets/hl-item-view',
|
||||
'app/views/widgets/dropdown'
|
||||
], function($, _, Backbone, Common, Moment, Simplemodal,
|
||||
Select2, Tabs, ShareView, HistorySettingsDialog,
|
||||
Select2, ShareView, HistorySettingsDialog,
|
||||
HLItemView, DropdownView) {
|
||||
|
||||
'use strict';
|
||||
@@ -109,7 +108,7 @@ define([
|
||||
formatSelectionTooBig: gettext("You cannot select any more choices")
|
||||
}));
|
||||
|
||||
$form.submit(function() {
|
||||
$form.on('submit', function() {
|
||||
var email = $.trim($('[name="email"]', $(this)).val());
|
||||
if (!email) {
|
||||
return false;
|
||||
@@ -138,7 +137,7 @@ define([
|
||||
error: function(xhr) {
|
||||
var error_msg;
|
||||
if (xhr.responseText) {
|
||||
error_msg = $.parseJSON(xhr.responseText).error_msg;
|
||||
error_msg = JSON.parse(xhr.responseText).error_msg;
|
||||
} else {
|
||||
error_msg = gettext("Failed. Please check the network.");
|
||||
}
|
||||
|
@@ -59,7 +59,7 @@ define([
|
||||
formatSelectionTooBig: gettext("You cannot select any more choices")
|
||||
}));
|
||||
|
||||
$form.submit(function() {
|
||||
$form.on('submit', function() {
|
||||
var library_name = $.trim($('[name="library_name"]', $form).val());
|
||||
var library_owner = $.trim($('[name="library_owner"]', $form).val());
|
||||
var $error = $('.error', $form);
|
||||
@@ -157,7 +157,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -70,7 +70,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -71,7 +71,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -107,7 +107,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -1,10 +1,11 @@
|
||||
define([
|
||||
'jquery',
|
||||
'jquery.ui', /* for tabs */
|
||||
'underscore',
|
||||
'backbone',
|
||||
'common',
|
||||
'sysadmin-app/views/folder-share-item'
|
||||
], function($, _, Backbone, Common, FolderShareItemView) {
|
||||
], function($, jQueryUI, _, Backbone, Common, FolderShareItemView) {
|
||||
'use strict';
|
||||
|
||||
var SharePopupView = Backbone.View.extend({
|
||||
@@ -170,8 +171,8 @@ define([
|
||||
$user_share_item.after(new_item.el);
|
||||
});
|
||||
$emails_input.select2("val", "");
|
||||
$('[value="rw"]', $perm).attr('selected', 'selected');
|
||||
$('[value="r"]', $perm).removeAttr('selected');
|
||||
$('option', $perm).prop('selected', false);
|
||||
$('[value="rw"]', $perm).prop('selected', true);
|
||||
$error.addClass('hide');
|
||||
}
|
||||
if (data.failed.length > 0) {
|
||||
@@ -185,7 +186,7 @@ define([
|
||||
error: function(xhr) {
|
||||
var err_msg;
|
||||
if (xhr.responseText) {
|
||||
err_msg = Common.HTMLescape($.parseJSON(xhr.responseText).error_msg);
|
||||
err_msg = Common.HTMLescape(JSON.parse(xhr.responseText).error_msg);
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
}
|
||||
@@ -243,8 +244,8 @@ define([
|
||||
$group_share_item.after(new_item.el);
|
||||
});
|
||||
$groups_input.select2("val", "");
|
||||
$('[value="rw"]', $perm).attr('selected', 'selected');
|
||||
$('[value="r"]', $perm).removeAttr('selected');
|
||||
$('option', $perm).prop('selected', false);
|
||||
$('[value="rw"]', $perm).prop('selected', true);
|
||||
$error.addClass('hide');
|
||||
}
|
||||
if (data.failed.length > 0) {
|
||||
@@ -258,7 +259,7 @@ define([
|
||||
error: function(xhr) {
|
||||
var err_msg;
|
||||
if (xhr.responseText) {
|
||||
err_msg = Common.HTMLescape($.parseJSON(xhr.responseText).error_msg);
|
||||
err_msg = Common.HTMLescape(JSON.parse(xhr.responseText).error_msg);
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
}
|
||||
|
@@ -19,11 +19,11 @@ define([
|
||||
this.render();
|
||||
|
||||
var _this = this;
|
||||
$('#js-toggle-side-nav').click(function() {
|
||||
$('#js-toggle-side-nav').on('click', function() {
|
||||
_this.show();
|
||||
return false;
|
||||
});
|
||||
$(window).resize(function() {
|
||||
$(window).on('resize', function() {
|
||||
if ($(window).width() >= 768) {
|
||||
_this.show();
|
||||
}
|
||||
|
@@ -53,7 +53,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
@@ -136,7 +136,7 @@ define([
|
||||
if (response['status'] == 401 || response['status'] == 403) {
|
||||
err_msg = gettext("Permission error");
|
||||
} else {
|
||||
err_msg = $.parseJSON(response.responseText).error_msg;
|
||||
err_msg = JSON.parse(response.responseText).error_msg;
|
||||
}
|
||||
} else {
|
||||
err_msg = gettext("Failed. Please check the network.");
|
||||
|
Reference in New Issue
Block a user