Permalink
Browse files

MINOR Upgraded jQuery.entwine (formerly known as jQuery.concrete) to …

…the latest trunk

MINOR Updated jQuery.concrete references to point to the new "entwine" name

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102695 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent ecc73e0 commit 8256228e69477eeec3a7b45d2683a0042d1cd960 @chillu chillu committed Apr 13, 2010
Showing with 3,134 additions and 623 deletions.
  1. +1 −1 forms/CalendarDateField.php
  2. +1 −1 forms/TabSet.php
  3. +2 −2 javascript/CalendarDateField.js
  4. +2 −2 javascript/TabSet.js
  5. +1 −1 security/Security.php
  6. BIN thirdparty/jquery-concrete/.DS_Store
  7. +0 −2 thirdparty/jquery-concrete/.gitignore
  8. +0 −8 thirdparty/jquery-concrete/.piston.yml
  9. +0 −77 thirdparty/jquery-concrete/src/jquery.concrete.properties.js
  10. +0 −114 thirdparty/jquery-concrete/src/jquery.dat.js
  11. +8 −0 thirdparty/jquery-entwine/.piston.yml
  12. 0 thirdparty/{jquery-concrete → jquery-entwine}/LICENSE
  13. +80 −46 thirdparty/{jquery-concrete → jquery-entwine}/README.textile
  14. +8 −7 thirdparty/{jquery-concrete → jquery-entwine}/build.sh
  15. +269 −182 thirdparty/{jquery-concrete → jquery-entwine}/dist/jquery.concrete-dist.js
  16. +1,587 −0 thirdparty/jquery-entwine/dist/jquery.entwine-dist.js
  17. +30 −0 thirdparty/jquery-entwine/spec/legacy/spec-dist.html
  18. +8 −1 thirdparty/{jquery-concrete/spec → jquery-entwine/spec/legacy}/spec.concrete.basics.js
  19. 0 thirdparty/{jquery-concrete/spec → jquery-entwine/spec/legacy}/spec.concrete.ctors.js
  20. +47 −3 thirdparty/{jquery-concrete/spec → jquery-entwine/spec/legacy}/spec.concrete.events.js
  21. 0 thirdparty/{jquery-concrete/spec → jquery-entwine/spec/legacy}/spec.concrete.namespaces.js
  22. +26 −1 thirdparty/{jquery-concrete/spec → jquery-entwine/spec/legacy}/spec.concrete.properties.js
  23. +24 −12 thirdparty/{jquery-concrete/spec → jquery-entwine/spec/legacy}/spec.concrete.super.js
  24. +39 −0 thirdparty/jquery-entwine/spec/legacy/spec.html
  25. +7 −7 thirdparty/{jquery-concrete → jquery-entwine}/spec/spec-dist.html
  26. +85 −0 thirdparty/jquery-entwine/spec/spec.entwine.basics.js
  27. +68 −0 thirdparty/jquery-entwine/spec/spec.entwine.ctors.js
  28. +112 −0 thirdparty/jquery-entwine/spec/spec.entwine.events.js
  29. +246 −0 thirdparty/jquery-entwine/spec/spec.entwine.namespaces.js
  30. +102 −0 thirdparty/jquery-entwine/spec/spec.entwine.properties.js
  31. +66 −0 thirdparty/jquery-entwine/spec/spec.entwine.super.js
  32. +11 −11 thirdparty/{jquery-concrete → jquery-entwine}/spec/spec.html
  33. +27 −19 ...party/{jquery-concrete/src/jquery.concrete.ctors.js → jquery-entwine/src/jquery.entwine.ctors.js}
  34. +8 −8 ...te/src/jquery.concrete.dommaybechanged.js → jquery-entwine/src/jquery.entwine.dommaybechanged.js}
  35. +24 −15 ...rty/{jquery-concrete/src/jquery.concrete.events.js → jquery-entwine/src/jquery.entwine.events.js}
  36. +71 −52 thirdparty/{jquery-concrete/src/jquery.concrete.js → jquery-entwine/src/jquery.entwine.js}
  37. +21 −0 thirdparty/jquery-entwine/src/jquery.entwine.legacy.js
  38. +85 −0 thirdparty/jquery-entwine/src/jquery.entwine.properties.js
  39. 0 thirdparty/{jquery-concrete → jquery-entwine}/src/jquery.focusinout.js
  40. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/ChangeLog
  41. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/errorIcon.png
  42. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/firebug-lite.css
  43. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/firebug-lite.js
  44. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/firebug.gif
  45. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/firebug_logo.png
  46. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/infoIcon.png
  47. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/progress.gif
  48. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/spacer.gif
  49. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/tree_close.gif
  50. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/tree_open.gif
  51. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/firebug_lite/warningIcon.png
  52. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jquery-1.3.2.js
  53. +22 −10 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jquery.selector/jquery.class.js
  54. +8 −8 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jquery.selector/jquery.selector.js
  55. +35 −30 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jquery.selector/jquery.selector.matches.js
  56. +3 −3 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jquery.selector/jquery.selector.specifity.js
  57. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/.piston.yml
  58. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/History.rdoc
  59. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/Manifest
  60. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/README.rdoc
  61. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/Rakefile
  62. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/bin/jspec
  63. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/jspec.gemspec
  64. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/images/bg.png
  65. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/images/hr.png
  66. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/images/loading.gif
  67. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/images/sprites.bg.png
  68. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/images/sprites.png
  69. BIN thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/images/vr.png
  70. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/jspec.css
  71. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/jspec.jquery.js
  72. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/jspec.js
  73. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/jspec.shell.js
  74. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/jspec.timers.js
  75. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/lib/jspec.xhr.js
  76. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/server/browsers.rb
  77. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/server/helpers.rb
  78. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/server/routes.rb
  79. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/server/server.rb
  80. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/async
  81. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/env.js
  82. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/fixtures/test.html
  83. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/fixtures/test.json
  84. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/fixtures/test.xml
  85. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/helpers.js
  86. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/server.rb
  87. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.dom.html
  88. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.fixtures.js
  89. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.grammar-less.js
  90. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.grammar.js
  91. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.jquery.js
  92. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.jquery.xhr.js
  93. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.js
  94. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.matchers.js
  95. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.modules.js
  96. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.node.js
  97. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.rhino.js
  98. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.server.html
  99. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.shared-behaviors.js
  100. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.utils.js
  101. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/spec/spec.xhr.js
  102. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/History.rdoc
  103. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/README.rdoc
  104. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/lib/yourlib.core.js
  105. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/spec/server.rb
  106. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/spec/spec.core.js
  107. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/spec/spec.dom.html
  108. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/spec/spec.rhino.js
  109. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/default/spec/spec.server.html
  110. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/rails/server.rb
  111. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/rails/spec.application.js
  112. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/rails/spec.dom.html
  113. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/rails/spec.rhino.js
  114. 0 thirdparty/{jquery-concrete → jquery-entwine}/vendor/jspec/templates/rails/spec.server.html
@@ -28,7 +28,7 @@ function Field() {
}
- Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/dist/jquery.concrete-dist.js');
+ Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
// javascript: custom
Requirements::javascript(SAPPHIRE_DIR . '/javascript/CalendarDateField.js');
View
@@ -58,7 +58,7 @@ public function FieldHolder() {
Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/ui.all.css');
Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/ui.tabs.css');
- Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/dist/jquery.concrete-dist.js');
+ Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
Requirements::javascript(SAPPHIRE_DIR . '/javascript/TabSet.js');
@@ -1,13 +1,13 @@
(function($) {
- $.concrete('ss', function($){
+ $.entwine('ss', function($){
/**
* Formats a <input type="text"> field with a jQuery UI datepicker.
*
* Requires: concrete, ui.datepicker, jquery.metadata
*
* @author Ingo Schommer, SilverStripe Ltd.
*/
- $('.calendardate').concrete({
+ $('.calendardate').entwine({
onmatch: function() {
this.find('input').each(function() {
var conf = $(this).metadata();
View
@@ -1,13 +1,13 @@
(function($){
- $.concrete('ss', function($){
+ $.entwine('ss', function($){
/**
* Lightweight wrapper around jQuery UI tabs.
* Ensures that anchor links are set properly,
* and any nested tabs are scrolled if they have
* their height explicitly set. This is important
* for forms inside the CMS layout.
*/
- $('.ss-tabset').concrete({
+ $('.ss-tabset').entwine({
onmatch: function() {
this.rewriteHashlinks();
View
@@ -349,7 +349,7 @@ public function login() {
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.tabs.js');
- Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/dist/jquery.concrete-dist.js');
+ Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js');
Requirements::css(THIRDPARTY_DIR . '/jquery/themes/smoothness/ui.all.css');
Requirements::css(THIRDPARTY_DIR . '/jquery/themes/smoothness/ui.tabs.css');
Binary file not shown.
@@ -1,2 +0,0 @@
-vendor/
-spec/
@@ -1,8 +0,0 @@
----
-format: 1
-handler:
- commit: bae4684bd5ab659bd78ebd990cc68ecba8a36669
- branch: master
-lock: false
-repository_class: Piston::Git::Repository
-repository_url: git://github.com/hafriedlander/jquery.concrete.git
@@ -1,77 +0,0 @@
-(function($) {
-
- var concrete_prepend = '__concrete!';
-
- var getConcreteData = function(el, namespace, property) {
- return el.data(concrete_prepend + namespace + '!' + property);
- }
-
- var setConcreteData = function(el, namespace, property, value) {
- return el.data(concrete_prepend + namespace + '!' + property, value);
- }
-
- var getConcreteDataAsHash = function(el, namespace) {
- var hash = {};
- var id = jQuery.data(el[0]);
-
- var matchstr = concrete_prepend + namespace + '!';
- var matchlen = matchstr.length;
-
- var cache = jQuery.cache[id];
- for (var k in cache) {
- if (k.substr(0,matchlen) == matchstr) hash[k.substr(matchlen)] = cache[k];
- }
-
- return hash;
- }
-
- var setConcreteDataFromHash = function(el, namespace, hash) {
- for (var k in hash) setConcreteData(namespace, k, hash[k]);
- }
-
- var concreteData = function(el, namespace, args) {
- switch (args.length) {
- case 0:
- return getConcreteDataAsHash(el, namespace);
- case 1:
- if (typeof args[0] == 'string') return getConcreteData(el, namespace, args[0]);
- else return setConcreteDataFromHash(el, namespace, args[0]);
- default:
- return setConcreteData(el, namespace, args[0], args[1]);
- }
- }
-
- $.extend($.fn, {
- concreteData: function() {
- return concreteData(this, '__base', arguments);
- }
- });
-
- $.concrete.Namespace.addHandler({
- order: 60,
-
- bind: function(selector, k, v) {
- if (k.charAt(0) != k.charAt(0).toUpperCase()) $.concrete.warn('Concrete property '+k+' does not start with a capital letter', $.concrete.WARN_LEVEL_BESTPRACTISE);
-
- var namespace = this;
- g = function() { return this.concreteData(k) || v ; }
- s = function(v){ return this.concreteData(k, v); }
-
- g.pname = s.pname = k;
-
- this.bind_proxy(selector, 'get'+k, g);
- this.bind_proxy(selector, 'set'+k, s);
-
- return true;
- },
-
- namespaceMethodOverrides: function(namespace){
- return {
- concreteData: function() {
- return concreteData(this, namespace.name, arguments);
- }
- };
- }
- });
-
-})(jQuery);
@@ -1,114 +0,0 @@
-/*
- * Provides a per-node data store that is automatically cloned when dom node is clone() or cloneNode()'d.
- */
-
-(function($){
- var data_store = {};
- var check_name = 'com.silverstripe:check_id';
-
- var expando = 'data_id:';
- var id = 0;
-
- /**
- * Clone a data object. Currently uses jQuery's deep copy routine
- */
- var cloneData = function(data) {
- return $.extend(true, {}, data);
- }
-
- /**
- * Set the data object for an element.
- * Picks a new ID, sets the tracking attribute and value on the DOM node and stores data in the data_store
- *
- * @param {jQuery selection} el - The element to store this data on
- * @param {Object} data - The object to use as data, or undefined / null for an empty object
- */
- var setData = function(el, data) {
- if (!data) data = {};
-
- id += 1;
- var data_id = expando + id;
-
- el.attr('data', data_id); el.data(check_name, data_id);
- return data_store[data_id] = data;
- }
-
-
- /**
- * Delete the data object for an element
- * It's important this is called when the related element is deled, or memory could leak. We monkey-patch jQuery.removeData to make sure this happens
- * @param {jQuery selection} el - The element to remove the data for
- */
- var clearData = function(el) {
- var data_id = el.attr('data');
- if (!data_id) return;
-
- el.removeAttr('data');
- // Only remove the data if this is the last element with a data reference to it. This is so removing an element
- // doesn't delete the data before any cloned elements have a chance to copy it
- if ($('[data='+data_id+']').length == 0) delete data_store[data_id];
- }
-
- /**
- * Get the data object for an element
- * Sets an empty data object if the element does not have one yet
- * Clones the data object if the element it's attached to has been cloned
- * @param {jQuery selection} el - The element to retrieve the data of
- */
- var getData = function(el) {
- // If the data_id is missing, the element has no data
- var data_id = el.attr('data');
- if (!data_id) return setData(el);
-
- var check_id = el.data(check_name);
- if (!check_id || check_id != data_id) {
- // If the check_id is missing, the element has been cloned. So clone the data too
- var newdata = cloneData(data_store[data_id]);
- setData(el, newdata);
- // If we were the last element holding on to a reference to that old data, delete it now that we're done with it
- if ($('[data='+data_id+']').length == 0) delete data_store[data_id];
- return newdata;
- }
-
- // Otherwise, this element has some data, so return it
- return data_store[data_id];
- }
-
- $.dat = {};
- /**
- * Check all data in data_store, removing any that are not longer referenced in the DOM
- * Returns number of garbage-collected entries, for finding memory leaks
- */
- $.dat.vacuum = function() {
- var i = 0;
- for (var k in data_store) {
- if ($('[data='+k+']').length == 0) { delete data_store[k]; i++; }
- }
- return i;
- }
- /**
- * Return count of items in data_store.
- * Used in tests
- */
- $.dat.size = function() {
- var i = 0;
- for (var k in data_store) i++;
- return i;
- }
-
- /**
- * Get the data object for the current element
- */
- $.fn.d = function(a){
- return getData(this.eq(0));
- };
-
- // Monkey patch removeData to also remove dat
- var removeData_without_dat = $.removeData
- $.removeData = function(elem, name) {
- if (!name) clearData($(elem));
- return removeData_without_dat.apply(this, arguments);
- }
-
- })(jQuery);
-
@@ -0,0 +1,8 @@
+---
+format: 1
+handler:
+ commit: f09e97da777031a67e136945f8732890c84e3e65
+ branch: master
+lock: false
+repository_class: Piston::Git::Repository
+repository_url: git://github.com/hafriedlander/jquery.entwine.git
Oops, something went wrong.

0 comments on commit 8256228

Please sign in to comment.