rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r1205337 - in /incubator/rave/trunk/rave-portal-resources/src/main/webapp: WEB-INF/jsp/views/ WEB-INF/jsp/views/admin/ script/
Date Wed, 23 Nov 2011 09:31:31 GMT
Author: jasha
Date: Wed Nov 23 09:31:29 2011
New Revision: 1205337

URL: http://svn.apache.org/viewvc?rev=1205337&view=rev
Log:
RAVE-364 Fix for add/update page form doesn't "submit" when pressing enter in title field
Switch to array of buttons with text and id attributes instead of looking for a button that
contains a certain text (preparation for i18n where the text will be different)
upgrade to latest minor release of jquery & jqueryui

Modified:
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/home.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
Wed Nov 23 09:31:29 2011
@@ -88,7 +88,7 @@
         </article>
     </div>
 
-    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
     <script src="<spring:url value="/script/rave_admin.js"/>"></script>
     <script>$(function() {
         rave.admin.initAdminUi();

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
Wed Nov 23 09:31:29 2011
@@ -97,7 +97,7 @@
         </article>
     </div>
 
-    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
     <script src="<spring:url value="/script/rave_admin.js"/>"></script>
     <script>$(function() {
         rave.admin.initAdminUi();

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/home.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/home.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/home.jsp
Wed Nov 23 09:31:29 2011
@@ -213,8 +213,8 @@
 </script>
 <portal:render-script location="${'BEFORE_LIB'}" />
 <script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.13/jquery-ui.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"></script>
 <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
 <!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
 <portal:render-script location="${'AFTER_LIB'}" />

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
Wed Nov 23 09:31:29 2011
@@ -156,8 +156,8 @@
     </script>
     <portal:render-script location="${'BEFORE_LIB'}" />
     <script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
-    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
-    <script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.13/jquery-ui.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"></script>
     <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
     <portal:render-script location="${'AFTER_LIB'}" />
     <portal:render-script location="${'BEFORE_RAVE'}" />

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
Wed Nov 23 09:31:29 2011
@@ -73,7 +73,7 @@
         </fieldset>
     </form:form>
 </div>
-<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
 <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
 <script src="<spring:url value="/script/rave.js"/>"></script>
 <script src="<spring:url value="/script/rave_forms.js"/>"></script>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
Wed Nov 23 09:31:29 2011
@@ -168,8 +168,8 @@
     </c:if>
 </div>
 
-<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.13/jquery-ui.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"></script>
 <!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
 <script src="<spring:url value="/script/rave.js"/>"></script>
 <script src="<spring:url value="/script/rave_api.js"/>"></script>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
Wed Nov 23 09:31:29 2011
@@ -72,7 +72,7 @@
             </fieldset>
         </form:form>
     </div>
-    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
     <script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
     <script src="<spring:url value="/script/rave.js"/>"></script>
     <script src="<spring:url value="/script/rave_forms.js"/>"></script>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
Wed Nov 23 09:31:29 2011
@@ -169,8 +169,8 @@
     <div id="editComment-dialog" title="Edit Comment" style="display: none;">
         <textarea id="editComment" rows="3" cols="50"> </textarea>
     </div>
-    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.1.min.js"></script>
-    <script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.13/jquery-ui.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
+    <script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"></script>
     <!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
     <script src="<spring:url value="/script/rave.js"/>"></script>
     <script src="<spring:url value="/script/rave_api.js"/>"></script>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js?rev=1205337&r1=1205336&r2=1205337&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js Wed Nov
23 09:31:29 2011
@@ -29,31 +29,50 @@ rave.layout = rave.layout || (function()
     var $dialog = $( "#dialog" ).dialog({
             autoOpen: false,
             modal: true,
-            buttons: {
-                    Add: function() {
-                            addPage();                            
-                    },
-
-                    Update: function() {
-                            updatePage();
-                    },
-
-                    Cancel: function() {
-                            $( this ).dialog( "close" );
+            buttons: [
+                {
+                    text: "Add",
+                    id: "AddPageBtn",
+                    click: function() {
+                        addPage();
                     }
-            },
+                },
+                {
+                    text: "Update",
+                    id: "UpdatePageBtn",
+                    click: function() {
+                        updatePage();
+                    }
+                },
+                {
+                    text: "Cancel",
+                    id: "CancelPageBtn",
+                    click: function() {
+                        $(this).dialog("close");
+                    }
+                }
+            ],
             open: function(event, ui) {
+                    $dialog.unbind("submit");
                     if ($tab_id.val() == '') {
                         $("#"+this.id).dialog("option", "title", "Add a New Page");
-                        $(":button:contains('Update')").hide();
-                        $(":button:contains('Add')").show();
+                        $("#UpdatePageBtn").hide();
+                        $("#AddPageBtn").show();
+                        $dialog.submit(function() {
+                            $("#AddPageBtn").click();
+                            return false;
+                        });
                     }
                     else {
                         $("#"+this.id).dialog("option", "title", "Update Page");
-                        $(":button:contains('Update')").show();
-                        $(":button:contains('Add')").hide();
+                        $("#UpdatePageBtn").show();
+                        $("#AddPageBtn").hide();
+                        $dialog.submit(function() {
+                            $(":button:contains('Update')").click();
+                            return false;
+                        });
+
                     }
-                    $tab_title_input.focus();
             },
             close: function() {
                     $form[ 0 ].reset();
@@ -66,14 +85,20 @@ rave.layout = rave.layout || (function()
     var $movePageDialog = $("#movePageDialog").dialog({
             autoOpen: false,
             modal: true,
-            buttons: {
-                    Move: function() {
-                            movePage();                            
-                    },
-                    Cancel: function() {
-                            $( this ).dialog( "close" );
+            buttons: [
+                {
+                    text: "Move",
+                    click: function() {
+                        movePage();
                     }
-            },
+                },
+                {
+                    text: "Cancel",
+                    click: function() {
+                        $( this ).dialog( "close" );
+                    }
+                }
+            ],
             open: function() {
                     $("#moveAfterPageId").focus();
             },
@@ -172,14 +197,20 @@ rave.layout = rave.layout || (function()
     var $moveWidgetDialog = $("#moveWidgetDialog").dialog({
             autoOpen: false,
             modal: true,
-            buttons: {
-                    Move: function() {
-                            moveWidgetToPage($(this).data('regionWidgetId'));
-                    },
-                    Cancel: function() {
-                            $( this ).dialog( "close" );
+            buttons: [
+                {
+                    text: "Move",
+                    click: function() {
+                        moveWidgetToPage($(this).data('regionWidgetId'));
                     }
-            },
+                },
+                {
+                    text: "Cancel",
+                    click: function() {
+                        $(this).dialog("close");
+                    }
+                }
+            ],
             open: function() {
                     $("#moveToPageId").focus();
             },



Mime
View raw message