Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user

2014-02-04 22:18:29 -03:00
parent 71bba1c5ab b765a21369
commit 7525ba4820
17 changed files with 96 additions and 83 deletions
--- a/wise-webapp/src/main/webapp/js/jquery-1.7.2.min.js
+++ b/wise-webapp/src/main/webapp/js/jquery-1.7.2.min.js
--- a/wise-webapp/src/main/webapp/js/jquery-2.1.0.min.js
+++ b/wise-webapp/src/main/webapp/js/jquery-2.1.0.min.js
--- a/wise-webapp/src/main/webapp/js/mindmapList.js
+++ b/wise-webapp/src/main/webapp/js/mindmapList.js
@@ -1,3 +1,8 @@
+// Hack for bootstrap issue with IE10. https://github.com/twbs/bootstrap/issues/3672
+if ($.browser.msie && $.browser.version > 9) {
+    $('.modal').removeClass('fade');
+}
+
 $.fn.dataTableExt.oApi.fnReloadAjax = function (oSettings, sNewSource, fnCallback, bStandingRedraw) {
    if (typeof sNewSource != 'undefined' && sNewSource != null) {
        oSettings.sAjaxSource = sNewSource;
@@ -98,55 +103,69 @@ jQuery.fn.dialogForm = function (options) {
        $('#' + containerId + ' input').each(function (index, elem) {
            formData[elem.name] = elem.value;
        });
+
+        // Success actions ...
+        var onSuccess = function (jqXHR, textStatus, data) {
+            if (options.redirect) {
+                var resourceId = jqXHR.getResponseHeader("ResourceId");
+                var redirectUrl = options.redirect;
+                redirectUrl = redirectUrl.replace("{header.resourceId}", resourceId);
+
+                // Hack: IE ignore the base href tag ...
+                var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("c/maps/"));
+                window.open(baseUrl + redirectUrl, '_self');
+
+            } else if (options.postUpdate) {
+                options.postUpdate(formData);
+            }
+            dialogElem.modal('hide');
+        };
+
+        // On error message
+        var onFailure = function (jqXHR, textStatus, data) {
+            var errors = JSON.parse(jqXHR.responseText);
+            // Mark fields with errors ...
+            var fieldErrors = errors.fieldErrors;
+            if (fieldErrors) {
+                for (var fieldName in fieldErrors) {
+                    // Mark the field with errors ...
+                    var message = fieldErrors[fieldName];
+                    var inputField = $("#" + containerId + " input[name='" + fieldName + "']");
+
+                    $("#" + containerId).find(".errorMessage").text(message).addClass("alert alert-error");
+                    inputField.parent().addClass('error');
+                }
+            }
+            var acceptBtn = $('#' + containerId + ' .btn-accept');
+            acceptBtn.button('reset');
+        };
+
+        var onError = function (jqXHR, textStatus, errorThrown) {
+            console.log(errorThrown);
+            console.log(jqXHR);
+            dialogElem.modal('hide');
+            $('#messagesPanel div div').text(errorThrown);
+            $('#messagesPanel').show()
+            var acceptBtn = $('#' + containerId + ' .btn-accept');
+            acceptBtn.button('reset');
+        };
+
        $(acceptBtn).button('loading');
        var dialogElem = this;
        jQuery.ajax(url, {
-            async:false,
-            dataType:'json',
-            data:JSON.stringify(formData),
-            type:options.type ? options.type : 'POST',
-            contentType:"application/json; charset=utf-8",
-            success:function (data, textStatus, jqXHR) {
-                if (options.redirect) {
-                    var resourceId = jqXHR.getResponseHeader("ResourceId");
-                    var redirectUrl = options.redirect;
-                    redirectUrl = redirectUrl.replace("{header.resourceId}", resourceId);
-
-                    // Hack: IE ignore the base href tag ...
-                    var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("c/maps/"));
-                    window.open(baseUrl + redirectUrl, '_self');
-
-                } else if (options.postUpdate) {
-                    options.postUpdate(formData);
-                }
-                dialogElem.modal('hide');
-            },
-            error:function (jqXHR, textStatus, errorThrown) {
-                if (jqXHR.status == 400) {
-                    var errors = JSON.parse(jqXHR.responseText);
-                    // Mark fields with errors ...
-                    var fieldErrors = errors.fieldErrors;
-                    if (fieldErrors) {
-                        for (var fieldName in fieldErrors) {
-                            // Mark the field with errors ...
-                            var message = fieldErrors[fieldName];
-                            var inputField = $("#" + containerId + " input[name='" + fieldName + "']");
-
-                            $("#" + containerId).find(".errorMessage").text(message).addClass("alert alert-error");
-                            inputField.parent().addClass('error');
-                        }
-                    }
-
-                } else {
-                    console.log(errorThrown);
-                    console.log(jqXHR);
-                    dialogElem.modal('hide');
-                    $('#messagesPanel div div').text(errorThrown);
-                    $('#messagesPanel').show()
-                }
-                var acceptBtn = $('#' + containerId + ' .btn-accept');
-                acceptBtn.button('reset');
-
+            async: false,
+            dataType: 'json',
+            data: JSON.stringify(formData),
+            type: options.type ? options.type : 'POST',
+            contentType: "application/json; charset=utf-8",
+            statusCode: {
+                200: onSuccess,
+                201: onSuccess,
+                204: onSuccess,
+                400: onFailure,
+                444: onError,
+                500: onError,
+                501: onError
            }
        });
    }.bind(this));
@@ -213,12 +232,12 @@ function updateStarred(spanElem) {
    }

    jQuery.ajax("c/restful/maps/" + mapId + "/starred", {
-        async:false,
-        dataType:'json',
-        data:"" + starred,
-        type:'PUT',
-        contentType:"text/plain",
-        success:function () {
+        async: false,
+        dataType: 'json',
+        data: "" + starred,
+        type: 'PUT',
+        contentType: "text/plain",
+        success: function () {
            if (starred) {
                $(spanElem).removeClass('starredOff');
                $(spanElem).addClass('starredOn');
@@ -227,7 +246,7 @@ function updateStarred(spanElem) {
                $(spanElem).addClass('starredOff');
            }
        },
-        error:function (jqXHR, textStatus, errorThrown) {
+        error: function (jqXHR, textStatus, errorThrown) {
            $('#messagesPanel div').text(errorThrown).parent().show();
        }
    });
@@ -249,8 +268,8 @@ $(function () {
    $("#newBtn").click(
        function () {
            $("#new-dialog-modal").dialogForm({
-                redirect:"c/maps/{header.resourceId}/edit",
-                url:"c/restful/maps"
+                redirect: "c/maps/{header.resourceId}/edit",
+                url: "c/restful/maps"
            });
        });

@@ -269,8 +288,8 @@ $(function () {

            // Initialize dialog ...
            $("#duplicate-dialog-modal").dialogForm({
-                redirect:"c/maps/{header.resourceId}/edit",
-                url:"c/restful/maps/" + mapId
+                redirect: "c/maps/{header.resourceId}/edit",
+                url: "c/restful/maps/" + mapId
            });
        }
    });
@@ -295,16 +314,16 @@ $(function () {

            // Initialize dialog ...
            $("#rename-dialog-modal").dialogForm({
-                type:'PUT',
-                clearForm:false,
-                postUpdate:function (reqBodyData) {
+                type: 'PUT',
+                clearForm: false,
+                postUpdate: function (reqBodyData) {
                    tableElem.dataTableExt.removeSelectedRows();

                    rowData.title = reqBodyData.title;
                    rowData.description = reqBodyData.description;
                    dataTable.fnAddData(JSON.parse(JSON.stringify(rowData)));
                },
-                url:"c/restful/maps/" + mapId
+                url: "c/restful/maps/" + mapId
            });
        }
    });
@@ -317,12 +336,12 @@ $(function () {
        if (mapIds.length > 0) {
            // Initialize dialog ...
            $("#delete-dialog-modal").dialogForm({
-                type:'DELETE',
-                postUpdate:function () {
+                type: 'DELETE',
+                postUpdate: function () {
                    // Remove old entry ...
                    tableUI.dataTableExt.removeSelectedRows();
                },
-                url:"c/restful/maps/batch?ids=" + jQuery.makeArray(mapIds).join(',')
+                url: "c/restful/maps/batch?ids=" + jQuery.makeArray(mapIds).join(',')
            });
        }
    });
--- a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
+++ b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
@@ -20,7 +20,7 @@
    <!--[if lt IE 9]>
    <meta http-equiv="X-UA-Compatible" content="chrome=1">
    <![endif]-->
-    <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
    <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
    <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/>
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -3,7 +3,7 @@

 <%--@elvariable id="isHsql" type="boolean"--%>

-<script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-2.1.0.min.js"></script>
 <script type="text/javascript" language="javascript">
    $(function () {
        $('#loginForm').submit(function () {
--- a/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
+++ b/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
@@ -4,7 +4,7 @@
 <%--@elvariable id="isHsql" type="boolean"--%>
 <!-- Simple OpenID Selector -->
 <link type="text/css" rel="stylesheet" href="css/openid.css"/>
-<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
 <script type="text/javascript" language="javascript" src="js/openid-jquery.js"></script>
 <script type="text/javascript" language="javascript" src="js/openid-en.js"></script>
 <!-- /Simple OpenID Selector -->
@@ -14,7 +14,7 @@
    });
 </script>

-<script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-2.1.0.min.js"></script>
 <script type="text/javascript" language="javascript">
    $(function () {
        $('#loginForm').submit(function () {
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -16,7 +16,7 @@

    <link rel="stylesheet/less" type="text/css" href="css/mindmapList.less"/>

-    <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
    <script src="js/less.js" type="text/javascript"></script>