Merge pull request #346 from swklein/integration

Changes on jQueryMobile Framework
wocommunity · Dec 21, 2012 · 5bb3c66 · 5bb3c66
2 parents 5a7c19f + 47e5da5
commit 5bb3c66
Show file tree

Hide file tree

Showing 24 changed files with 2,594 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,14 +3,5 @@ bin
 *.xcodeproj
 *.pbxproj
 ant.*
-.DS_Store
-*.o
-*.lo
-*.slo
-*.la
-*.so
-Utilities/Adaptors/Apache2.2/.libs
 
-dist
-build.number
 
diff --git a/Frameworks/Ajax/ERJQueryMobile/.classpath b/Frameworks/Ajax/ERJQueryMobile/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="Sources"/>
   <classpathentry combineaccessrules="false" kind="con" path="WOFramework/ERExtensions"/>
   <classpathentry combineaccessrules="false" kind="con" path="WOFramework/ERJars"/>
-  <classpathentry combineaccessrules="false" kind="con" path="WOFramework/ERPrototypes"/>
   <classpathentry combineaccessrules="false" kind="con" path="WOFramework/JavaWOExtensions"/>
   <classpathentry combineaccessrules="false" kind="con" path="WOFramework/WOOgnl"/>
   <classpathentry combineaccessrules="false" kind="con" path="WOFramework/JavaEOAccess"/>

diff --git a/Frameworks/Ajax/ERJQueryMobile/Components/ERQMBackButton.api b/Frameworks/Ajax/ERJQueryMobile/Components/ERQMBackButton.api
@@ -2,5 +2,6 @@
 <wodefinitions>
     <wo class="ERQMBackButton" wocomponentcontent="false">    <binding name="string"/>
         <binding name="theme"/>
+    <binding name=" mini"/>
     </wo>
 </wodefinitions>
diff --git a/Frameworks/Ajax/ERJQueryMobile/Components/ERQMCollapsibleComponentContent.api b/Frameworks/Ajax/ERJQueryMobile/Components/ERQMCollapsibleComponentContent.api
@@ -4,5 +4,7 @@
     <binding name="theme"/>
         <binding name="content-theme"/>
     <binding defaults="Boolean" name="collapsed"/>
+    <binding defaults="Boolean" name="inset"/>
+        <binding defaults="Boolean" name="mini"/>
     </wo>
 </wodefinitions>
diff --git a/Frameworks/Ajax/ERJQueryMobile/Components/ERQMDialogLink.api b/Frameworks/Ajax/ERJQueryMobile/Components/ERQMDialogLink.api
@@ -8,5 +8,7 @@
     <binding name="icon"/>
     <binding name="theme"/>
     <binding defaults="Boolean" name="isButton"/>
+    <binding name="iconpos"/>
+        <binding defaults="Boolean" name="mini"/>
     </wo>
 </wodefinitions>
diff --git a/Frameworks/Ajax/ERJQueryMobile/Components/ERQMHeaderBar.api b/Frameworks/Ajax/ERJQueryMobile/Components/ERQMHeaderBar.api
@@ -15,5 +15,7 @@
 
     <binding name="rightButton-linkResource"/>
     <binding name="backButton-action"/>
+    <binding name="backButton-iconpos"/>
+        <binding name="rightButton-iconpos"/>
     </wo>
 </wodefinitions>
diff --git a/Frameworks/Ajax/ERJQueryMobile/Components/ERQMListViewElement.api b/Frameworks/Ajax/ERJQueryMobile/Components/ERQMListViewElement.api
@@ -15,5 +15,7 @@
     <binding defaults="Boolean" name="automaticDivider"/>
     <binding defaults="Boolean" name="isInputContainer"/>
     <binding name="linkResource"/>
+    <binding defaults="Boolean" name="isDialogCall"/>
+    <binding name="queryDictionary"/>
     </wo>
 </wodefinitions>
diff --git a/...s/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMBackButton.wo/ERQMBackButton.html b/...s/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMBackButton.wo/ERQMBackButton.html
@@ -1 +1 @@
-<wo:genericContainer elementName="a" href="#" data-role="button" data-theme="$^theme" data-rel="back"><wo:str value="$^string" valueWhenEmpty="$localizer.ERJQueryMobile.Cancel" /></wo:genericContainer>
+<wo:genericContainer elementName="a" href="#" data-role="button" data-theme="$^theme" data-rel="back" data-mini ="$^mini"><wo:str value="$^string" valueWhenEmpty="$localizer.ERJQueryMobile.Cancel" /></wo:genericContainer>
diff --git a/...onlocalized.lproj/ERQMCollapsibleComponentContent.wo/ERQMCollapsibleComponentContent.html b/...onlocalized.lproj/ERQMCollapsibleComponentContent.wo/ERQMCollapsibleComponentContent.html
@@ -1,4 +1,4 @@
-<wo:genericContainer elementName="div" data-role="collapsible" data-content-theme="$^content-theme" data-theme="$^theme" data-collapsed="$^collapsed">
+<wo:genericContainer elementName="div" data-role="collapsible" data-content-theme="$^content-theme" data-theme="$^theme" data-collapsed="$^collapsed" data-inset = "$^inset" data-mini="$^mini">
   <h3><wo:str value="$^string" valueWhenEmpty="No Value" /></h3>
   <wo:content />
-</wo:genericContainer>
+</wo:genericContainer>
diff --git a/...ks/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMDialogLink.wo/ERQMDialogLink.wod b/...ks/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMDialogLink.wo/ERQMDialogLink.wod
@@ -5,7 +5,9 @@ ACTION : ERXHyperlinkResource {
 	data-transition = ^transition;
 	data-role = isButton;
 	data-rel = "dialog";
+	data-mini = ^mini;
 	data-icon = ^icon;
+	data-iconpos = ^iconpos;
 	data-theme = ^theme;
 }
 
@@ -16,6 +18,8 @@ LINK : ERXHyperlinkResource {
 	data-transition = ^transition;
 	data-role = isButton;
 	data-rel = "dialog";
+	data-mini = ^mini;
 	data-icon = ^icon;
+	data-iconpos = ^iconpos;
 	data-theme = ^theme;
-}
+}
diff --git a/...rks/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMHeaderBar.wo/ERQMHeaderBar.html b/...rks/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMHeaderBar.wo/ERQMHeaderBar.html
@@ -3,12 +3,12 @@
   	<webobject name="HasBackButtonAnAction">
   		<webobject name="BackLink"><wo:str value="$^backButton-title" valueWhenEmpty="$localizer.ERJQueryMobile.Back" /></webobject>
   	</webobject><webobject name="HasNoBackButtonAnAction">
-		<wo:hyperlink href="#" data-theme="$^backButton-theme" data-icon="arrow-l" data-rel="back"><wo:str value="$^backButton-title" valueWhenEmpty="$localizer.ERJQueryMobile.Back" /></wo:hyperlink>
+		<wo:hyperlink href="#" data-theme="$^backButton-theme" data-icon="arrow-l" data-rel="back" data-iconpos = "$^backButton-iconpos"><wo:str value="$^backButton-title" valueWhenEmpty="$localizer.ERJQueryMobile.Back" /></wo:hyperlink>
   	</webobject>
   </wo:if>
   <h1><wo:str value="$^string" /></h1>
   <wo:if condition="$hasAction"><webobject name="ACTION" /></wo:if>
   <wo:else>
     <wo:if condition="$hasLinkResource"><webobject name="LINK" /></wo:if>
   </wo:else>
-</wo:genericContainer>
+</wo:genericContainer>
diff --git a/...orks/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMHeaderBar.wo/ERQMHeaderBar.wod b/...orks/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMHeaderBar.wo/ERQMHeaderBar.wod
@@ -2,6 +2,7 @@ ACTION : ERXHyperlinkResource {
 	action = ^rightButton-action;
 	string = ^rightButton-title;
 	data-icon = ^rightButton-icon;
+	data-iconpos = ^rightButton-iconpos;
 	data-theme = ^rightButton-theme;
 	class = "ui-btn-right";	
 }
@@ -10,21 +11,23 @@ LINK : ERXHyperlinkResource {
 	linkResource = ^rightButton-linkResource;
 	string = ^rightButton-title;
 	data-icon = ^rightButton-icon;
+	data-iconpos = ^rightButton-iconpos;
 	data-theme = ^rightButton-theme;
 	class = "ui-btn-right";	
 }
 
 HasBackButtonAnAction : WOConditional {
-	condition = ^backButton-action;
+	condition = hasBackButtonAction;
 }
 
 BackLink : WOHyperlink {
 	action = ^backButton-action;
 	data-theme = ^backButton-theme;
 	data-icon = "arrow-l";
+	data-iconpos = ^backButton-iconpos;
 }
 
 HasNoBackButtonAnAction : WOConditional {
-	condition = ^backButton-action;
+	condition = hasBackButtonAction;
 	negate = true;
 }
diff --git a/...works/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMListView.wo/ERQMListView.html b/...works/Ajax/ERJQueryMobile/Components/Nonlocalized.lproj/ERQMListView.wo/ERQMListView.html
@@ -1 +1 @@
-<wo:genericContainer elementName="$elementName" data-role="listview" data-theme="$^theme" data-count-theme="$^countBubble-theme" data-inset="$^inset" data-filter="$^filter" data-split-icon="$^split-icon" data-split-theme="$^split-theme" divider-theme="$^divider-theme" data-filter-placeholder="$^filterString"><wo:content /></wo:genericContainer>
+<wo:genericContainer elementName="$elementName" data-role="listview" data-theme="$^theme" data-count-theme="$^countBubble-theme" data-inset="$^inset" data-filter="$^filter" data-split-icon="$^split-icon" data-split-theme="$^split-theme" data-divider-theme="$^divider-theme" data-filter-placeholder="$^filterString"><wo:content /></wo:genericContainer>
diff --git a/...QueryMobile/Components/Nonlocalized.lproj/ERQMListViewElement.wo/ERQMListViewElement.html b/...QueryMobile/Components/Nonlocalized.lproj/ERQMListViewElement.wo/ERQMListViewElement.html
@@ -5,7 +5,7 @@
 </wo:if>
 <wo:genericContainer elementName="li" otherTagString="$html">
   <wo:if condition="$hasAction">
-    <wo:ERXHyperlinkResource action="$^action">
+    <wo:ERXHyperlinkResource action="$^action" data-rel="$dataRel" queryDictionary = "$^queryDictionary">
       <wo:content />
       <wo:if condition="$hasSideText">
         <p class="ui-li-aside"><wo:str value="$sideText" escapeHTML="false" /></p>
@@ -14,7 +14,7 @@
   </wo:if>
   <wo:else>
     <wo:if condition="$hasLinkResource">
-      <wo:ERXHyperlinkResource linkResource="$^linkResource">
+      <wo:ERXHyperlinkResource linkResource="$^linkResource" data-rel="$dataRel" queryDictionary = "$^queryDictionary">
         <wo:content />
         <wo:if condition="$hasSideText">
           <p class="ui-li-aside"><wo:str value="$sideText" escapeHTML="false" /></p>
@@ -31,4 +31,4 @@
   <wo:if condition="$hasCountBubble">
     <span class="ui-li-count"><wo:str value="$countBubble" /></span>
   </wo:if>
-</wo:genericContainer>
+</wo:genericContainer>
diff --git a/Frameworks/Ajax/ERJQueryMobile/Resources/German.lproj/Localizable.strings b/Frameworks/Ajax/ERJQueryMobile/Resources/German.lproj/Localizable.strings
@@ -0,0 +1,4 @@
+{
+	"ERJQueryMobile.Cancel" = "Abbrechen";
+	"ERJQueryMobile.Back" = "Zurück";
+}
diff --git a/Frameworks/Ajax/ERJQueryMobile/Resources/Properties b/Frameworks/Ajax/ERJQueryMobile/Resources/Properties
@@ -10,15 +10,37 @@ er.jquerymobile.jquery.use.odn=true
 er.jquerymobile.javascript.use.odn=true
 er.jquerymobile.css.use.odn=true
 
+### 1.2.0 - ODN
+# Note: If jQuery core 1.8+ is used with jQuery Mobile, iOS 3.x and BB5 are re-graded to C level support because core dropped support for methods these platforms need for full functionality.
+# To Support this switch back to jQuery core 1.7.2
+er.jquerymobile.jquery.odn.location=http://code.jquery.com/jquery-1.8.3.min.js
+er.jquerymobile.javascript.odn.location=http://code.jquery.com/mobile/1.2.0/jquery.mobile-1.2.0.min.js
+er.jquerymobile.css.odn.location=http://code.jquery.com/mobile/1.2.0/jquery.mobile-1.2.0.min.css
+
+### 1.2.0 - LOCAL
+er.jquerymobile.jquery.local.location=static://WOJqueryMobile:javascript/jquery-1.8.3.min.js
+er.jquerymobile.javascript.local.location=static://WOJqueryMobile:javascript/jquery.mobile-1.2.0.min.js
+er.jquerymobile.css.local.location=static://WOJqueryMobile:css/jquery.mobile-1.2.0.min.css
+
+### 1.1.1 - ODN
+#er.jquerymobile.jquery.odn.location=http://code.jquery.com/jquery-1.7.2.min.js
+#er.jquerymobile.javascript.odn.location=http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.js
+#er.jquerymobile.css.odn.location=http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css
+
+### 1.1.1 - LOCAL
+#er.jquerymobile.jquery.local.location=static://WOJqueryMobile:javascript/jquery-1.7.2.min.js
+#er.jquerymobile.javascript.local.location=static://WOJqueryMobile:javascript/jquery.mobile-1.1.1.min.js
+#er.jquerymobile.css.local.location=static://WOJqueryMobile:css/jquery.mobile-1.1.1.min.css
+
 ### 1.1.0 RC2 - ODN
-er.jquerymobile.jquery.odn.location=http://code.jquery.com/jquery-1.7.1.min.js
-er.jquerymobile.javascript.odn.location=http://code.jquery.com/mobile/1.1.0-rc.2/jquery.mobile-1.1.0-rc.2.min.js
-er.jquerymobile.css.odn.location=http://code.jquery.com/mobile/1.1.0-rc.2/jquery.mobile-1.1.0-rc.2.min.css
+#er.jquerymobile.jquery.odn.location=http://code.jquery.com/jquery-1.7.1.min.js
+#er.jquerymobile.javascript.odn.location=http://code.jquery.com/mobile/1.1.0-rc.2/jquery.mobile-1.1.0-rc.2.min.js
+#er.jquerymobile.css.odn.location=http://code.jquery.com/mobile/1.1.0-rc.2/jquery.mobile-1.1.0-rc.2.min.css
 
 ### 1.1.0 RC2 - LOCAL
-er.jquerymobile.jquery.local.location=static://WOJqueryMobile:javascript/jquery-1.7.1.min.js
-er.jquerymobile.javascript.local.location=static://WOJqueryMobile:javascript/jquery.mobile-1.1.0-rc.2.min.js
-er.jquerymobile.css.local.location=static://WOJqueryMobile:css/jquery.mobile-1.1.0-rc.2.min.css
+#er.jquerymobile.jquery.local.location=static://WOJqueryMobile:javascript/jquery-1.7.1.min.js
+#er.jquerymobile.javascript.local.location=static://WOJqueryMobile:javascript/jquery.mobile-1.1.0-rc.2.min.js
+#er.jquerymobile.css.local.location=static://WOJqueryMobile:css/jquery.mobile-1.1.0-rc.2.min.css
 
 #### 1.0.1 - ODN
 #er.jquerymobile.jquery.odn.location=http://code.jquery.com/jquery-1.6.4.min.js

diff --git a/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/components/ERQMHeaderBar.java b/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/components/ERQMHeaderBar.java
@@ -51,4 +51,6 @@ public boolean hasLinkResource() {
     return hasBinding("rightButton-linkResource");
   }
 
-}
+  public boolean hasBackButtonAction() {
+	    return hasBinding("backButton-action");
+	  }}
diff --git a/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/components/ERQMListViewElement.java b/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/components/ERQMListViewElement.java
@@ -69,6 +69,10 @@ public boolean isDivider() {
     return booleanValueForBinding("isDivider", false);
   }
 
+  public String dataRel() {
+	return (booleanValueForBinding("isDialogCall", false))?"dialog":null;
+  }
+
   public boolean hasAction() {
     return hasBinding("action");
   }
@@ -118,7 +122,9 @@ public boolean autoDivider() {
   public boolean hasAutomaticDivider() {
     boolean b = booleanValueForBinding("automaticDivider", false);
     if(b)
-      filtertext();
+	{
+		filtertext();
+	}
 
     return b;
   }
@@ -145,7 +151,7 @@ public String html() {
     if(!ERXStringUtilities.stringIsNullOrEmpty(s)) {
       sb.append("data-icon='" + s + "' ");
     }
-
+    
     return sb.toString();
   }
 }
diff --git a/Frameworks/Ajax/ERJQueryMobile/WebServerResources/css/jquery.mobile-1.1.1.min.css b/Frameworks/Ajax/ERJQueryMobile/WebServerResources/css/jquery.mobile-1.1.1.min.css
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<wo:genericContainer elementName="a" href="#" data-role="button" data-theme="$^theme" data-rel="back"><wo:str value="$^string" valueWhenEmpty="$localizer.ERJQueryMobile.Cancel" /></wo:genericContainer>
		<wo:genericContainer elementName="a" href="#" data-role="button" data-theme="$^theme" data-rel="back" data-mini ="$^mini"><wo:str value="$^string" valueWhenEmpty="$localizer.ERJQueryMobile.Cancel" /></wo:genericContainer>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<wo:genericContainer elementName="$elementName" data-role="listview" data-theme="$^theme" data-count-theme="$^countBubble-theme" data-inset="$^inset" data-filter="$^filter" data-split-icon="$^split-icon" data-split-theme="$^split-theme" divider-theme="$^divider-theme" data-filter-placeholder="$^filterString"><wo:content /></wo:genericContainer>
		<wo:genericContainer elementName="$elementName" data-role="listview" data-theme="$^theme" data-count-theme="$^countBubble-theme" data-inset="$^inset" data-filter="$^filter" data-split-icon="$^split-icon" data-split-theme="$^split-theme" data-divider-theme="$^divider-theme" data-filter-placeholder="$^filterString"><wo:content /></wo:genericContainer>