jquery-ui-rails 5.0.4 → 7.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 933bd109d892bed13f8668dccc787543384d3acbdb1a8402cd6488b85fa86617
+  data.tar.gz: 7425bccaba329f6051041644966ab6c3b296876b5d77500e7a63e706f5bf2837
+SHA512:
+  metadata.gz: add74c84e4c4b224af4d796d32d4819e26d31b29a6c7a176cd5f9480e19e467aa310bfe1d0c57281d549fc1ee4bb1d7cc3cde1b45e43bde110886e8728a59c6b
+  data.tar.gz: 0a4c0abf3ee331cf5530fdea0fa0de101449565582097178430933f0e2c25a4ab7bb9f6512f28495d2d8159e1fdb999f2c50b9bfeb55d7c2528e03dfbccf150c

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "jquery-ui"]
 	path = jquery-ui
-	url = git://github.com/jquery/jquery-ui.git
+	url = git@github.com:jquery/jquery-ui.git

data/.travis.yml

@@ -1,2 +1,2 @@
 rvm:
-  - 1.9.3
+  - 2.2.2

data/History.md

@@ -1,5 +1,26 @@
 # master
 
+# 7.0.0
+
+* Update to jQuery UI 1.13.0
+
+# 6.0.1
+
+* Fix "define is not defined" issue in `core.js`
+
+# 6.0.0
+
+* Update to jQuery UI 1.12.1
+* The widget files moved. Change e.g. `require jquery-ui/sortable` to `require jquery-ui/widgets/sortable`
+
+# 5.0.5
+
+* Update to jQuery UI 1.11.4
+
+# 5.0.4
+
+* Update to jQuery UI 1.11.3
+
 # 5.0.3
 
 * Speed up: Only use .erb extension if `<%= %>` tags are used
@@ -67,8 +88,8 @@
 * Upgrade to jQuery UI 1.10.0
 
 * No more automatic `//= require jquery`
-  ([#30](https://github.com/joliss/jquery-ui-rails/pull/30), original
-  discussion at [#17](https://github.com/joliss/jquery-ui-rails/pull/17)).
+  ([#30](https://github.com/jquery-ui-rails/jquery-ui-rails/pull/30), original
+  discussion at [#17](https://github.com/jquery-ui-rails/jquery-ui-rails/pull/17)).
   This means that you have to add `//= require jquery` to your application.js
   file before you require any of the jQuery UI JavaScript modules.
 

data/README.md

@@ -1,7 +1,7 @@
 # jquery-ui-rails
 
-[![Build Status](https://secure.travis-ci.org/joliss/jquery-ui-rails.png?branch=master)](http://travis-ci.org/joliss/jquery-ui-rails)
-[![Dependency Status](https://gemnasium.com/joliss/jquery-ui-rails.png)](https://gemnasium.com/joliss/jquery-ui-rails)
+[![Build Status](https://travis-ci.org/jquery-ui-rails/jquery-ui-rails.svg?branch=master)](https://travis-ci.org/jquery-ui-rails/jquery-ui-rails)
+[![Dependency Status](https://gemnasium.com/jquery-ui-rails/jquery-ui-rails.svg)](https://gemnasium.com/jquery-ui-rails/jquery-ui-rails)
 
 This gem packages the jQuery UI assets (JavaScripts, stylesheets, and
 images) for the Rails [asset
@@ -12,10 +12,6 @@ interface](http://jqueryui.com/download) again.
 See [VERSIONS.md](VERSIONS.md) to see which versions of jquery-ui-rails bundle
 which versions of jQuery UI.
 
-Also check out the
-[jquery-ui-sass-rails](https://github.com/jhilden/jquery-ui-sass-rails) gem,
-which allows you to override theme variables with Sass.
-
 Warning: This gem is incompatible with the `jquery-rails` gem before version
 3.0.0! Strange things will happen if you use an earlier `jquery-rails`
 version. Run `bundle list` to ensure that you either aren't using
@@ -45,9 +41,12 @@ Also add the jQuery UI CSS to your application.css:
  */
 ```
 
-Warning: If you are using a version below 5.0, you will have to use a different naming
-for the files to require, see https://github.com/joliss/jquery-ui-rails/blob/v4.2.1/README.md
-for more information.
+### Warning:
+Due to directory structure changes between jQuery UI 1.10, 1.11, and 1.12,
+if you use version is lower than 6.0, you will have to use a different naming
+for the files to require, please check following links for more information:
+[for 5.0 users](https://github.com/jquery-ui-rails/jquery-ui-rails/blob/v5.0.5/README.md),
+[for 4.2 users](https://github.com/jquery-ui-rails/jquery-ui-rails/blob/v4.2.1/README.md).
 
 All images required by jQuery UI are automatically served through the asset
 pipeline, so you are good to go! For example, this code will add a
@@ -70,10 +69,11 @@ For example, if you only need the datepicker module, add this to your
 application.js:
 
 ```javascript
-//= require jquery-ui/datepicker
+//= require jquery-ui/widgets/datepicker
 ```
 
-In your application.css, require the corresponding CSS module:
+In your application.css, require the corresponding CSS module (notice
+no `widgets/` subdirectory here):
 
 ```css
 /*
@@ -88,7 +88,6 @@ In your application.css, require the corresponding CSS module:
 ```javascript
 //= require jquery-ui/core
 //= require jquery-ui/widget
-//= require jquery-ui/mouse
 //= require jquery-ui/position
 ```
 
@@ -98,31 +97,32 @@ other JavaScript modules as needed.
 ### Interactions
 
 ```javascript
-//= require jquery-ui/draggable
-//= require jquery-ui/droppable
-//= require jquery-ui/resizable
-//= require jquery-ui/selectable
-//= require jquery-ui/sortable
+//= require jquery-ui/widgets/mouse
+//= require jquery-ui/widgets/draggable
+//= require jquery-ui/widgets/droppable
+//= require jquery-ui/widgets/resizable
+//= require jquery-ui/widgets/selectable
+//= require jquery-ui/widgets/sortable
 ```
 
-For all but `jquery-ui/droppable`, remember to `require` their matching CSS
+For all but `jquery-ui/mouse` and `jquery-ui/droppable`, remember to `require` their matching CSS
 files in your application.css as well.
 
 ### Widgets
 
 ```javascript
-//= require jquery-ui/accordion
-//= require jquery-ui/autocomplete
-//= require jquery-ui/button
-//= require jquery-ui/datepicker
-//= require jquery-ui/dialog
-//= require jquery-ui/menu
-//= require jquery-ui/progressbar
-//= require jquery-ui/selectmenu
-//= require jquery-ui/slider
-//= require jquery-ui/spinner
-//= require jquery-ui/tabs
-//= require jquery-ui/tooltip
+//= require jquery-ui/widgets/accordion
+//= require jquery-ui/widgets/autocomplete
+//= require jquery-ui/widgets/button
+//= require jquery-ui/widgets/datepicker
+//= require jquery-ui/widgets/dialog
+//= require jquery-ui/widgets/menu
+//= require jquery-ui/widgets/progressbar
+//= require jquery-ui/widgets/selectmenu
+//= require jquery-ui/widgets/slider
+//= require jquery-ui/widgets/spinner
+//= require jquery-ui/widgets/tabs
+//= require jquery-ui/widgets/tooltip
 ```
 
 For all of these, remember to `require` their matching CSS files in your
@@ -132,38 +132,43 @@ application.css as well.
 
 Datepicker has optional i18n modules for non-US locales, named
 `jquery-ui/datepicker-xx[-YY]`
-([list](https://github.com/joliss/jquery-ui-rails/tree/master/app/assets/javascripts)),
+([list](https://github.com/jquery-ui-rails/jquery-ui-rails/tree/master/app/assets/javascripts)),
 for example:
 
 ```javascript
-//= require jquery-ui/datepicker
-//= require jquery-ui/datepicker-pt-BR
+//= require jquery-ui/widgets/datepicker
+//= require jquery-ui/i18n/datepicker-pt-BR
 ```
 
 Note that you still need to include the main datepicker module. It is not
 required automatically [for performance
-reasons](https://github.com/joliss/jquery-ui-rails/issues/9#issuecomment-6524987).
+reasons](https://github.com/jquery-ui-rails/jquery-ui-rails/issues/9#issuecomment-6524987).
 
 ### Effects
 
 ```javascript
 //= require jquery-ui/effect.all
+```
+
+OR
+
+```javascript
 //= require jquery-ui/effect
-//= require jquery-ui/effect-blind
-//= require jquery-ui/effect-bounce
-//= require jquery-ui/effect-clip
-//= require jquery-ui/effect-drop
-//= require jquery-ui/effect-explode
-//= require jquery-ui/effect-fade
-//= require jquery-ui/effect-fold
-//= require jquery-ui/effect-highlight
-//= require jquery-ui/effect-puff
-//= require jquery-ui/effect-pulsate
-//= require jquery-ui/effect-scale
-//= require jquery-ui/effect-shake
-//= require jquery-ui/effect-size
-//= require jquery-ui/effect-slide
-//= require jquery-ui/effect-transfer
+//= require jquery-ui/effects/effect-blind
+//= require jquery-ui/effects/effect-bounce
+//= require jquery-ui/effects/effect-clip
+//= require jquery-ui/effects/effect-drop
+//= require jquery-ui/effects/effect-explode
+//= require jquery-ui/effects/effect-fade
+//= require jquery-ui/effects/effect-fold
+//= require jquery-ui/effects/effect-highlight
+//= require jquery-ui/effects/effect-puff
+//= require jquery-ui/effects/effect-pulsate
+//= require jquery-ui/effects/effect-scale
+//= require jquery-ui/effects/effect-shake
+//= require jquery-ui/effects/effect-size
+//= require jquery-ui/effects/effect-slide
+//= require jquery-ui/effects/effect-transfer
 ```
 
 ## Stylesheet Assets
@@ -226,7 +231,7 @@ The `jquery-ui-rails` gem should work in Ruby 1.8.7 apps. To run the rake
 tasks, you need Ruby 1.9 however.
 
 ```bash
-git clone git://github.com/joliss/jquery-ui-rails.git
+git clone git://github.com/jquery-ui-rails/jquery-ui-rails.git
 cd jquery-ui-rails
 git submodule update --init
 bundle install
@@ -274,6 +279,18 @@ rails server
 
 Now point your browser at [http://localhost:3000/](http://localhost:3000/).
 
+### Releasing
+
+Be sure that `VERSIONS.md`, `History.md` and `lib/jquery/ui/rails/version.rb`
+are up-to-date. Then build and push like so:
+
+```bash
+rake build
+gem push pkg/jquery-ui-rails-X.Y.Z.gem
+git tag vX.Y.Z
+git push --tags
+```
+
 ## Limitations
 
 *   Only the base theme (Smoothness) is included. Once it becomes possible to

data/Rakefile

@@ -2,12 +2,6 @@ Encoding.default_external = "UTF-8" if defined?(Encoding)
 require 'json'
 require 'bundler/gem_tasks'
 
-# returns the source filename for a given JSON build file
-# (e.g., "ui.core.jquery.json" returns "core.js")
-def source_file_for_build_file(build_file)
-  "#{build_file.sub('ui.', '').sub('.jquery.json', '')}.js"
-end
-
 # returns the source filename for a named file in the 'dependencies'
 # array of a JSON build file
 # (e.g., if the JSON build file contains
@@ -22,10 +16,10 @@ end
 #
 # The only exception is "jquery", which doesn't follow the
 # same naming conventions so it's a special case.
-def source_file_for_dependency_entry(dep_entry)
-  return "jquery.js" if dep_entry == 'jquery'
-
-  "#{dep_entry.sub 'ui.', ''}.js"
+def source_file_for_dependency_entry(caller, dep_entry)
+  p = Pathname.new caller
+  parent_path = p.parent
+  parent_path.join(dep_entry + '.js').to_s
 end
 
 # return a Hash of dependency info, whose keys are jquery-ui
@@ -33,19 +27,33 @@ end
 # they depend on
 def map_dependencies
   dependencies = {}
-  Dir.glob("jquery-ui/*.jquery.json").each do |build_file|
-    build_info = JSON.parse(File.read build_file)
-    source_file_name = source_file_for_build_file(File.basename(build_file))
+  Dir.glob("jquery-ui/ui/**/*.js").each do |path|
+    basename = File.basename path
+    file = File.read path
+
+    matchdata = file.match(/define\(\s*\[\s*([\"\.\/\,\w\s\-\:]+)\]/m)
+
+    next if matchdata.nil?
+
+    deps = matchdata[1]
 
-    deps = build_info['dependencies'].keys
+    # remove lines with comments
+    deps = deps.gsub(/\/\/.+\s/, "")
+
+    # remove all non-path symbols
+    deps = deps.gsub(/[\r\n\t\"\[\]\s]/, "")
+
+    deps_paths = deps.split(',')
+
+    deps_paths.map!(&method(:remove_js_extension))
 
     # None of jquery.ui files should depend on jquery.js,
     # so we remove 'jquery' from the list of dependencies for all files
-    deps.reject! {|d| d == "jquery" }
+    deps_paths.reject! {|d| d == "jquery" }
 
-    deps.map! {|d| source_file_for_dependency_entry d }
+    deps_paths.map! {|d| source_file_for_dependency_entry path, d }
 
-    dependencies[source_file_name] = deps
+    dependencies[basename] = deps_paths
   end
   dependencies
 end
@@ -70,7 +78,7 @@ def get_js_dependencies(basename)
   end
   # Make sure we do not package assets with broken dependencies
   dependencies.each do |dep|
-    unless File.exist?("jquery-ui/ui/#{dep}")
+    unless File.exist?("#{dep}")
       fail "#{basename}: missing #{dep}"
     end
   end
@@ -107,14 +115,23 @@ task :javascripts => :submodule do
   target_dir = "app/assets/javascripts"
   target_ui_dir = "#{target_dir}/jquery-ui"
   mkdir_p target_ui_dir
+  mkdir_p target_ui_dir + '/effects'
+  mkdir_p target_ui_dir + '/widgets'
+  mkdir_p target_ui_dir + '/i18n'
+  mkdir_p target_ui_dir + '/vendor/jquery-color'
 
-  Dir.glob("jquery-ui/ui/*.js").each do |path|
+  Dir.glob("jquery-ui/ui/**/*.js").each do |path|
     basename = File.basename(path)
+    clean_path = path.gsub('/ui', '')
     dep_modules = get_js_dependencies(basename).map(&method(:remove_js_extension))
-    File.open("#{target_ui_dir}/#{basename}", "w") do |out|
+    File.open("#{target_dir}/#{clean_path}", "w") do |out|
       dep_modules.each do |mod|
-        out.write("//= require jquery-ui/#{mod}\n")
+        mod.gsub!('/ui', '')
+        out.write("//= require #{mod}\n")
       end
+      # core.js is deprecated and uses define function which is usually unavailable
+      # so we need only dependency loading there with no file contents
+      next if clean_path == 'jquery-ui/core.js'
       out.write("\n") unless dep_modules.empty?
       source_code = File.read(path)
       source_code.gsub!('@VERSION', version)
@@ -124,10 +141,10 @@ task :javascripts => :submodule do
   end
 
   # process the i18n files separately for performance, since they will not have dependencies
-  # https://github.com/joliss/jquery-ui-rails/issues/9
+  # https://github.com/jquery-ui-rails/jquery-ui-rails/issues/9
   Dir.glob("jquery-ui/ui/i18n/*.js").each do |path|
     basename = File.basename(path)
-    File.open("#{target_ui_dir}/#{basename}", "w") do |out|
+    File.open("#{target_ui_dir}/i18n/#{basename}", "w") do |out|
       source_code = File.read(path)
       source_code.gsub!('@VERSION', version)
       protect_copyright_notice(source_code)
@@ -136,15 +153,27 @@ task :javascripts => :submodule do
   end
 
   File.open("#{target_ui_dir}/effect.all.js", "w") do |out|
-    Dir.glob("jquery-ui/ui/effect*.js").sort.each do |path|
-      asset_name = remove_js_extension(File.basename(path))
-      out.write("//= require jquery-ui/#{asset_name}\n")
+    Dir.glob("jquery-ui/ui/effects/*.js").sort.each do |path|
+      clean_path = remove_js_extension(path).gsub('/ui', '')
+      out.write("//= require #{clean_path}\n")
     end
   end
   File.open("#{target_dir}/jquery-ui.js", "w") do |out|
     Dir.glob("jquery-ui/ui/*.js").sort.each do |path|
-      asset_name = remove_js_extension(File.basename(path))
-      out.write("//= require jquery-ui/#{asset_name}\n")
+      clean_path = remove_js_extension(path).gsub('/ui', '')
+      out.write("//= require #{clean_path}\n")
+    end
+    Dir.glob("jquery-ui/ui/effects/*.js").sort.each do |path|
+      clean_path = remove_js_extension(path).gsub('/ui', '')
+      out.write("//= require #{clean_path}\n")
+    end
+    Dir.glob("jquery-ui/ui/widgets/*.js").sort.each do |path|
+      clean_path = remove_js_extension(path).gsub('/ui', '')
+      out.write("//= require #{clean_path}\n")
+    end
+    Dir.glob("jquery-ui/ui/vendor/jquery-color/*.js").sort.each do |path|
+      clean_path = remove_js_extension(path).gsub('/ui', '')
+      out.write("//= require #{clean_path}\n")
     end
   end
 end
@@ -174,7 +203,7 @@ task :stylesheets => :submodule do
         dependencies.each do |dependency|
           dependency = dependency.sub(/\.js$/, '')
           dependent_stylesheet = "#{dependency}.css"
-          extra_dependencies << dependency if File.exists?("#{css_dir}/#{dependent_stylesheet}")
+          extra_dependencies << dependency if File.exist?("#{css_dir}/#{dependent_stylesheet}")
         end
         extra_dependencies << 'theme'
       end

data/VERSIONS.md

@@ -2,6 +2,10 @@
 
 | Gem    | jQuery UI |
 |--------|-----------|
+| 7.0.0  | 1.13.0    |
+| 6.0.1  | 1.12.1    |
+| 6.0.0  | 1.12.1    |
+| 5.0.5  | 1.11.4    |
 | 5.0.4  | 1.11.3    |
 | 5.0.3  | 1.11.2    |
 | 5.0.2  | 1.11.2    |