zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

still removing .bind(this) usages

Browse Source
This commit is contained in:
Ezequiel Bergamaschi
2014-12-26 18:07:31 -03:00
parent ff6ff266c5
commit 0d20938506
12 changed files with 60 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@@ -3,13 +3,13 @@
##################################################################################
# MySQL 5.X configuration properties
#database.url=jdbc:mysql://localhost/wisemapping?useUnicode=yes&characterEncoding=UTF-8
#database.driver=com.mysql.jdbc.Driver
#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
#database.username=wisemapping
#database.password=password
#database.validation.enabled=true
#database.validation.query=SELECT 1
database.url=jdbc:mysql://localhost/wisemapping?useUnicode=yes&characterEncoding=UTF-8
database.driver=com.mysql.jdbc.Driver
database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
database.username=wisemapping
database.password=password
database.validation.enabled=true
database.validation.query=SELECT 1
## PostgreSQL configuration properties
#database.url=jdbc:postgresql://<hostname:port>/wisemapping
@@ -23,11 +23,11 @@
# HSQL Configuration properties
database.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
database.driver=org.hsqldb.jdbc.JDBCDriver
database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
database.username=sa
database.password=
#database.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
#database.driver=org.hsqldb.jdbc.JDBCDriver
#database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
#database.username=sa
#database.password=
database.validation.enabled=false
database.validation.query=

23
wise-webapp/src/main/webapp/js/mindmapList.js
View File

@@ -85,7 +85,8 @@ jQuery.fn.dialogForm = function (options) {
var acceptBtn = $('#' + containerId + ' .btn-accept');
acceptBtn.button('reset');
acceptBtn.unbind('click').click( function (event) {
var dialogElem = this;
acceptBtn.unbind('click').one('click', function (event) {
var formData = {};
$('#' + containerId + ' input').each(function (index, elem) {
formData[elem.name] = elem.value;
@@ -138,7 +139,6 @@ jQuery.fn.dialogForm = function (options) {
};
$(acceptBtn).button('loading');
var dialogElem = this;
jQuery.ajax(url, {
async: false,
dataType: 'json',
@@ -155,11 +155,11 @@ jQuery.fn.dialogForm = function (options) {
501: onError
}
});
}.bind(this));
});
$('#' + containerId + ' .btn-cancel').click(function () {
this.modal('hide');
}.bind(this));
});
// Register enter input to submit...
$("input").keypress(function(event) {
@@ -174,6 +174,7 @@ jQuery.fn.dialogForm = function (options) {
$(this).find('input:first').focus();
});
this.modal();
this.first('input').focus();
};
@@ -357,7 +358,7 @@ $(function () {
}
});
$("#renameBtn").click(function () {
$("#renameBtn").click(function (event) {
// Map to be cloned ...
var tableElem = $('#mindmapListTable');
var rows = tableElem.dataTableExt.getSelectedRows();
@@ -446,12 +447,14 @@ $(function () {
var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds();
if (mapIds.length > 0 || ignore) {
var mapId = mapIds[0];
$('#' + dialogElemId + ' .modal-body').load(urlTemplate.replace("{mapId}", mapId),
var modalElement = $('#' + dialogElemId);
modalElement.find('.modal-body').load(urlTemplate.replace("{mapId}", mapId),
function () {
$('#' + dialogElemId + ' .btn-accept').unbind('click').click(function () {
modalElement.find('.btn-accept').unbind('click').click(function () {
submitDialogForm();
});
$('#' + dialogElemId).modal();
modalElement.modal();
//TODO here we need to make focus on a input tag
});
}
};
@@ -647,7 +650,9 @@ function prepareLabelList(labels) {
});
//add the defaultValue
labelList.append('<li><div class="listSeparator"></div></li>')
if (labels.length > 0) {
labelList.append('<li><div class="listSeparator"></div></li>')
}
labelList.append(defaultValue);
}

4
wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
View File

@@ -17,7 +17,7 @@
<div class="form-group">
<label for="title" class="control-label col-md-2 "><spring:message code="NAME"/>: </label>
<div class="col-md-10">
<input type="text" id="title" name="title" required="required"
<input type="text" id="title" name="title" required="required" autofocus="autofocus"
placeholder="<spring:message code="MAP_NAME_HINT"/>"
class="form-control" maxlength="255"/>
</div>
@@ -126,4 +126,4 @@
$('#dialogMainForm').submit();
}
</script>
</script>

14
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@@ -460,7 +460,7 @@
</div>
<!-- Delete map dialog -->
<div id="delete-dialog-modal" class="modal fade">
<div id="delete-dialog-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -503,7 +503,7 @@
</div>
<!-- Info map dialog -->
<div id="info-dialog-modal" class="modal fade">
<div id="info-dialog-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -521,7 +521,7 @@
</div>
<!-- Publish Dialog Config -->
<div id="publish-dialog-modal" class="modal fade">
<div id="publish-dialog-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -541,7 +541,7 @@
</div>
<!-- Export Dialog Config -->
<div id="export-dialog-modal" class="modal fade">
<div id="export-dialog-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -561,7 +561,7 @@
</div>
<!-- Import Dialog Config -->
<div id="import-dialog-modal" class="modal fade">
<div id="import-dialog-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -582,7 +582,7 @@
</div>
<!-- Share Dialog Config -->
<div id="share-dialog-modal" class="modal fade">
<div id="share-dialog-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -602,7 +602,7 @@
</div>
<!-- History Dialog Config -->
<div id="history-dialog-modal" class="modal fade">
<div id="history-dialog-modal" class="modal fade" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">