All: Moved version numbers into prototypes. Fixed #7436 - Widget: Store version numbe...

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index c6b33befb8cc2dc4e9577320451eac10587bf9c8..7602ae9bccdfda7fbcde3b5784da378d34896684 100644 (file)
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -15,6 +15,7 @@
 
 // TODO: use ui-accordion-header-active class and fix styling
 $.widget( "ui.accordion", {
+       version: "@VERSION",
        options: {
                active: 0,
                animated: "slide",
@@ -432,7 +433,6 @@ $.widget( "ui.accordion", {
 });
 
 $.extend( $.ui.accordion, {
-       version: "@VERSION",
        animations: {
                slide: function( options, additions ) {
                        var showOverflow = options.toShow.css( "overflow" ),

diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 4619949fb7101b815aeca7c612f59671e8dc5477..e39b4649e25ec7d4ddc52606c539f3e5769c53e5 100644 (file)
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -19,6 +19,7 @@
 var requestIndex = 0;
 
 $.widget( "ui.autocomplete", {
+       version: "@VERSION",
        defaultElement: "<input>",
        options: {
                appendTo: "body",
@@ -475,7 +476,6 @@ $.widget( "ui.autocomplete", {
 });
 
 $.extend( $.ui.autocomplete, {
-       version: "@VERSION",
        escapeRegex: function( value ) {
                return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
        },

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 32e00e9e054f387e0a0ce418eaf1a123e53324a4..482cdc24cf3564efdab722774aa4ed9724c7f1da 100644 (file)
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -41,6 +41,7 @@ var lastActive, startXPos, startYPos, clickDragged,
        };
 
 $.widget( "ui.button", {
+       version: "@VERSION",
        defaultElement: "<button>",
        options: {
                disabled: null,
@@ -412,6 +413,4 @@ $.widget( "ui.buttonset", {
        }
 });
 
-$.ui.buttonset.version = "@VERSION";
-
 }( jQuery ) );

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 84b2dd3b36f3723d81759d1aab896ee543f85ed0..0eba39842ba5819b23f3082cfad09206fef27bd5 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -36,6 +36,7 @@ var uiDialogClasses = "ui-dialog ui-widget ui-widget-content ui-corner-all ",
        };
 
 $.widget("ui.dialog", {
+       version: "@VERSION",
        options: {
                autoOpen: true,
                buttons: {},
@@ -655,8 +656,6 @@ $.widget("ui.dialog", {
 });
 
 $.extend($.ui.dialog, {
-       version: "@VERSION",
-
        uuid: 0,
        maxZ: 0,
 

diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index f8c187a7a1309948e608c9df3d1db07bd647db7b..6475ebd611644763be1d9cc57aa005c96e22fdb9 100644 (file)
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.draggable", $.ui.mouse, {
+       version: "@VERSION",
        widgetEventPrefix: "drag",
        options: {
                addClasses: true,
@@ -502,10 +503,6 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.draggable, {
-       version: "@VERSION"
-});
-
 $.ui.plugin.add("draggable", "connectToSortable", {
        start: function(event, ui) {
 

diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 58a1c4bc197f5d020220eb8be2ea973aab89a3f9..3942c6b8f49ae764ca8f97be3abba5e8fe236423 100644 (file)
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -16,6 +16,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.droppable", {
+       version: "@VERSION",
        widgetEventPrefix: "drop",
        options: {
                accept: '*',
@@ -146,10 +147,6 @@ $.widget("ui.droppable", {
 
 });
 
-$.extend($.ui.droppable, {
-       version: "@VERSION"
-});
-
 $.ui.intersect = function(draggable, droppable, toleranceMode) {
 
        if (!droppable.offset) return false;

diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 41b2e7a1a49db038ad5f9e3d2d680a2d172b45d0..03e14f12491483e584a58fd79f010c95cb769b30 100644 (file)
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -16,6 +16,7 @@
 var idIncrement = 0;
 
 $.widget("ui.menu", {
+       version: "@VERSION",
        defaultElement: "<ul>",
        delay: 150,
        options: {
@@ -420,6 +421,4 @@ $.widget("ui.menu", {
        }
 });
 
-$.ui.menu.version = "@VERSION";
-
 }( jQuery ));

diff --git a/ui/jquery.ui.menubar.js b/ui/jquery.ui.menubar.js
index 2879d079c03035deb687574893d1c970ef104703..6716805977af87e37b733494b8f010f727f3302b 100644 (file)
--- a/ui/jquery.ui.menubar.js
+++ b/ui/jquery.ui.menubar.js
@@ -18,6 +18,7 @@
 // TODO when mixing clicking menus and keyboard navigation, focus handling is broken
 // there has to be just one item that has tabindex
 $.widget( "ui.menubar", {
+       version: "@VERSION",
    options: {
       buttons: false,
       menuIcon: false

diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index 2fb1389f2b8ba652a23ccdff2aa675a3ab121e17..582eaf9c046d6699c84071d72747a1573024776f 100644 (file)
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -18,6 +18,7 @@ $(document).mousedown(function(e) {
 });
 
 $.widget("ui.mouse", {
+       version: "@VERSION",
        options: {
                cancel: ':input,option',
                distance: 1,

diff --git a/ui/jquery.ui.popup.js b/ui/jquery.ui.popup.js
index 10361a35cacd3825748ce9672e71e16e7b9c6551..c90755fbb948c3318e239b3c7985f43791cc25b5 100644 (file)
--- a/ui/jquery.ui.popup.js
+++ b/ui/jquery.ui.popup.js
@@ -17,6 +17,7 @@
 var idIncrement = 0;
 
 $.widget( "ui.popup", {
+       version: "@VERSION",
        options: {
                position: {
                        my: "left top",

diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index e3b25cfd798b1d5c1d7e628f11d22e426010e586..18747068188f8df9860f4823aea57a4ae1cee970 100644 (file)
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -14,6 +14,7 @@
 (function( $, undefined ) {
 
 $.widget( "ui.progressbar", {
+       version: "@VERSION",
        options: {
                value: 0,
                max: 100
@@ -100,8 +101,4 @@ $.widget( "ui.progressbar", {
        }
 });
 
-$.extend( $.ui.progressbar, {
-       version: "@VERSION"
-});
-
 })( jQuery );

diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index de24e94dde034480122c667fc93ffa3758636907..673a8fd753b18e99881645caa681a4ae3aabc552 100644 (file)
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.resizable", $.ui.mouse, {
+       version: "@VERSION",
        widgetEventPrefix: "resize",
        options: {
                alsoResize: false,
@@ -548,10 +549,6 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.resizable, {
-       version: "@VERSION"
-});
-
 /*
  * Resizable Extensions
  */

diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js
index fa7d011229c4a927178e3c257db116fddb0f12fb..75f1cee66a89b6ff6b71f4b3da0cb9ccb0d18424 100644 (file)
--- a/ui/jquery.ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.selectable", $.ui.mouse, {
+       version: "@VERSION",
        options: {
                appendTo: 'body',
                autoRefresh: true,
@@ -259,8 +260,4 @@ $.widget("ui.selectable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.selectable, {
-       version: "@VERSION"
-});
-
 })(jQuery);

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index f0b01d7c074f6f369adb4d34dc3153ba4fea5858..978155370771941d0ddf24f4b1ffa64de0026118 100644 (file)
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -19,7 +19,7 @@
 var numPages = 5;
 
 $.widget( "ui.slider", $.ui.mouse, {
-
+       version: "@VERSION",
        widgetEventPrefix: "slide",
 
        options: {
@@ -659,8 +659,4 @@ $.widget( "ui.slider", $.ui.mouse, {
 
 });
 
-$.extend( $.ui.slider, {
-       version: "@VERSION"
-});
-
 }(jQuery));

diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index a8084412f80a6d783f12c1c0afb8a99eae21db9c..99798a915353ede2961414e92ccd68dc32e0f824 100644 (file)
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.sortable", $.ui.mouse, {
+       version: "@VERSION",
        widgetEventPrefix: "sort",
        options: {
                appendTo: "parent",
@@ -1069,8 +1070,4 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.sortable, {
-       version: "@VERSION"
-});
-
 })(jQuery);

diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index 0a0ebb37e826116e9a9728be60d83922cffd6487..4a23aca5383266672736030184f29dab043a9cb1 100644 (file)
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -14,6 +14,7 @@
 (function( $ ) {
 
 $.widget( "ui.spinner", {
+       version: "@VERSION",
        defaultElement: "<input>",
        widgetEventPrefix: "spin",
        options: {
@@ -368,6 +369,4 @@ $.widget( "ui.spinner", {
        }
 });
 
-$.ui.spinner.version = "@VERSION";
-
 }( jQuery ) );

diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 239805b146d26ffa28786b3c8090ed462a2b7ecd..515a93ae0aa2891c5dc2538ec346d957a7238627 100644 (file)
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -19,6 +19,7 @@ function getNextTabId() {
 }
 
 $.widget( "ui.tabs", {
+       version: "@VERSION",
        options: {
                active: null,
                collapsible: false,
@@ -577,10 +578,6 @@ $.widget( "ui.tabs", {
        }
 });
 
-$.extend( $.ui.tabs, {
-       version: "@VERSION"
-});
-
 // DEPRECATED
 if ( $.uiBackCompat !== false ) {
 

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 56e5fa5c2db9e9500d9735a393d0026d961767c4..4560418ab9c96500cd8a8f60476390353858fff9 100644 (file)
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -17,6 +17,7 @@
 var increments = 0;
 
 $.widget( "ui.tooltip", {
+       version: "@VERSION",
        options: {
                tooltipClass: null,
                items: "[title]",
@@ -155,6 +156,4 @@ $.widget( "ui.tooltip", {
        }
 });
 
-$.ui.tooltip.version = "@VERSION";
-
 }( jQuery ) );

diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 3bf735cd3aece28ef86b06aa8a948262e454b567..da52a5a9c7443b09a79925bea88c284e65c6a029 100644 (file)
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -49,7 +49,7 @@ $.widget = function( name, base, prototype ) {
                if ( arguments.length ) {
                        this._createWidget( options, element );
                }
-       }, $[ namespace ][ name ] );
+       }, $[ namespace ][ name ], { version: prototype.version } );
 
        var basePrototype = new base();
        // we need to make the options hash a property directly on the new instance