From bc78f0954494ad71f7adef6c14582c183f51278b Mon Sep 17 00:00:00 2001 From: Felix Borzik Date: Thu, 1 Dec 2016 19:27:32 +0200 Subject: [PATCH] =?UTF-8?q?fix=20=E2=80=9Cdefine=20is=20not=20defined?= =?UTF-8?q?=E2=80=9D=20error=20when=20jquery-ui=20file=20is=20loaded?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rakefile | 3 +++ app/assets/javascripts/jquery-ui/core.js | 22 ---------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Rakefile b/Rakefile index 59b4651a..d2c13b02 100644 --- a/Rakefile +++ b/Rakefile @@ -128,6 +128,9 @@ task :javascripts => :submodule do 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) diff --git a/app/assets/javascripts/jquery-ui/core.js b/app/assets/javascripts/jquery-ui/core.js index 3b90e887..ce71e66c 100644 --- a/app/assets/javascripts/jquery-ui/core.js +++ b/app/assets/javascripts/jquery-ui/core.js @@ -13,25 +13,3 @@ //= require jquery-ui/tabbable //= require jquery-ui/unique-id //= require jquery-ui/version - -// This file is deprecated in 1.12.0 to be removed in 1.13 -( function() { -define( [ - "jquery", - "./data", - "./disable-selection", - "./focusable", - "./form", - "./ie", - "./keycode", - "./labels", - "./jquery-1-7", - "./plugin", - "./safe-active-element", - "./safe-blur", - "./scroll-parent", - "./tabbable", - "./unique-id", - "./version" -] ); -} )();