Item12511: adding support for html5 meta data

... and some minor fixes
foswiki · Sep 4, 2015 · 13a566c · 13a566c
1 parent c0ed15d
commit 13a566c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery-ui.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery-ui.uncompressed.js
@@ -13082,21 +13082,14 @@ $.widget( "ui.spinner", {
  */
 (function( $, undefined ) {
 
-var tabId = 0,
-	rhash = /#.*$/;
+var tabId = 0;
 
 function getNextTabId() {
 	return ++tabId;
 }
 
 function isLocal( anchor ) {
-	// support: IE7
-	// IE7 doesn't normalize the href property when set via script (#9317)
-	anchor = anchor.cloneNode( false );
-
-	return anchor.hash.length > 1 &&
-		decodeURIComponent( anchor.href.replace( rhash, "" ) ) ===
-			decodeURIComponent( location.href.replace( rhash, "" ) );
+        return $(anchor).attr("href")[0] === '#';
 }
 
 $.widget( "ui.tabs", {

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.datepicker.init.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.datepicker.init.uncompressed.js
@@ -3,12 +3,14 @@ jQuery(function($) {
 
   var datepickerDefaults = {
     dateFormat:'d M yy',
-    firstDay: 1
+    firstDay: 1,
+    showOn: 'button',
+    buttonText: "<i class='fa fa-calendar'></i>"
   };
 
   $(".jqUIDatepicker").livequery(function() {
     var $this = $(this), 
-        opts = $.extend({}, datepickerDefaults, $this.data(), $this.metadata()),
+        opts = $.extend({}, datepickerDefaults, $this.metadata(), $this.data()),
         maxZIndex = 1;
 
     $this.parents().each(function() {

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.dialog.init.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.dialog.init.uncompressed.js
@@ -3,6 +3,7 @@ jQuery(function($) {
 
   var dialogDefaults = {
     width: 300,
+    cached:false,
     autoOpen:false,
     draggable:false,
     resizable:false,
@@ -17,14 +18,10 @@ jQuery(function($) {
   // dialog
   $(".jqUIDialog").livequery(function() {
     var $this = $(this), 
-        opts = $.extend({}, dialogDefaults, $this.metadata()),
+        opts = $.extend({}, dialogDefaults, $this.metadata(), $this.data()),
         buttons = [];
 
-    if ($this.data("autoOpen")) {
-      opts.autoOpen = true;
-    }
-
-    if (!$this.data("cached")) {
+    if (!opts.cached) {
       opts.close = function() {
         $this.dialog("destroy");
         $this.remove();

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.tabs.init.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.tabs.init.uncompressed.js
@@ -2,7 +2,7 @@
 jQuery(function($) {
 
   $(".jqUITabs").livequery(function() {
-    var $this = $(this), opts = $.extend({}, $this.metadata());
+    var $this = $(this), opts = $.extend({}, $this.metadata(), $this.data());
     $this.removeClass("jqUITabs").tabs(opts);
   });