Skip to content

Commit

Permalink
Migrate assets to ESM-based structure
Browse files Browse the repository at this point in the history
  • Loading branch information
mshibuya committed Nov 20, 2021
1 parent 4af4e98 commit ef4ed79
Show file tree
Hide file tree
Showing 59 changed files with 1,228 additions and 192 deletions.
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
app/assets/stylesheets/rails_admin/aristo
app/assets/stylesheets/rails_admin/themes/cerulean
coverage
spec/dummy_app/public
spec/dummy_app/tmp
spec/support/jquery.simulate.drag-sortable.js
src/rails_admin/styles/aristo
src/rails_admin/styles/themes/cerulean
vendor
1 change: 0 additions & 1 deletion app/assets/javascripts/rails_admin/custom/ui.js

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/rails_admin/jquery-ui.js

This file was deleted.

26 changes: 0 additions & 26 deletions app/assets/javascripts/rails_admin/ra.i18n.js

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 0 additions & 11 deletions app/assets/stylesheets/rails_admin/custom/mixins.scss

This file was deleted.

13 changes: 0 additions & 13 deletions app/assets/stylesheets/rails_admin/custom/theming.scss

This file was deleted.

15 changes: 0 additions & 15 deletions app/assets/stylesheets/rails_admin/custom/variables.scss

This file was deleted.

2 changes: 1 addition & 1 deletion spec/dummy_app/app/javascript/packs/rails_admin.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import "rails_admin/src/base";
import "rails_admin/src/rails_admin/base";
import "../stylesheets/rails_admin.scss";
2 changes: 1 addition & 1 deletion spec/dummy_app/app/javascript/stylesheets/rails_admin.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import "~rails_admin/src/styles/base.scss";
@import "~rails_admin/src/rails_admin/styles/base.scss";
21 changes: 21 additions & 0 deletions src/rails_admin/base.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import Rails from "@rails/ujs";
import jQuery from "jquery";
import moment from "moment";
import "./vendor/jquery.pjax";
import "./vendor/jquery_nested_form";
import "bootstrap";
import "moment/min/locales.js";
import "eonasdan-bootstrap-datetimepicker";

import "./filter-box";
import "./filtering-multiselect";
import "./filtering-select";
import "./nested-form-hooks";
import "./remote-form";
import "./sidescroll";
import "./ui";
import "./widgets";

Rails.start();
window.$ = window.jQuery = jQuery;
window.moment = moment;
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import jQuery from "jquery";
import moment from "moment";
import I18n from "./i18n";

(function ($) {
var filters;

Expand Down Expand Up @@ -25,22 +29,22 @@
.append(
$('<option value="true"></option>')
.prop("selected", field_value == "true")
.text(RailsAdmin.I18n.t("true"))
.text(I18n.t("true"))
)
.append(
$('<option value="false"></option>')
.prop("selected", field_value == "false")
.text(RailsAdmin.I18n.t("false"))
.text(I18n.t("false"))
);
if (!required) {
control.append([
'<option disabled="disabled">---------</option>',
$('<option value="_present"></option>')
.prop("selected", field_value == "_present")
.text(RailsAdmin.I18n.t("is_present")),
.text(I18n.t("is_present")),
$('<option value="_blank"></option>')
.prop("selected", field_value == "_blank")
.text(RailsAdmin.I18n.t("is_blank")),
.text(I18n.t("is_blank")),
]);
}
break;
Expand All @@ -59,42 +63,40 @@
'<option data-additional-fieldset="default" value="default"></option>'
)
.prop("selected", field_operator == "default")
.text(
RailsAdmin.I18n.t(field_type == "time" ? "time" : "date")
)
.text(I18n.t(field_type == "time" ? "time" : "date"))
)
.append(
$(
'<option data-additional-fieldset="between" value="between"></option>'
)
.prop("selected", field_operator == "between")
.text(RailsAdmin.I18n.t("between_and_"))
.text(I18n.t("between_and_"))
);
if (field_type != "time") {
control.append([
$('<option value="today"></option>')
.prop("selected", field_operator == "today")
.text(RailsAdmin.I18n.t("today")),
.text(I18n.t("today")),
$('<option value="yesterday"></option>')
.prop("selected", field_operator == "yesterday")
.text(RailsAdmin.I18n.t("yesterday")),
.text(I18n.t("yesterday")),
$('<option value="this_week"></option>')
.prop("selected", field_operator == "this_week")
.text(RailsAdmin.I18n.t("this_week")),
.text(I18n.t("this_week")),
$('<option value="last_week"></option>')
.prop("selected", field_operator == "last_week")
.text(RailsAdmin.I18n.t("last_week")),
.text(I18n.t("last_week")),
]);
}
if (!required) {
control.append([
'<option disabled="disabled">---------</option>',
$('<option value="_not_null"></option>')
.prop("selected", field_operator == "_not_null")
.text(RailsAdmin.I18n.t("is_present")),
.text(I18n.t("is_present")),
$('<option value="_null"></option>')
.prop("selected", field_operator == "_null")
.text(RailsAdmin.I18n.t("is_blank")),
.text(I18n.t("is_blank")),
]);
}
additional_control = $.map(
Expand Down Expand Up @@ -139,10 +141,10 @@
: [
$('<option value="_present"></option>')
.prop("selected", field_value == "_present")
.text(RailsAdmin.I18n.t("is_present")),
.text(I18n.t("is_present")),
$('<option value="_blank"></option>')
.prop("selected", field_value == "_blank")
.text(RailsAdmin.I18n.t("is_blank")),
.text(I18n.t("is_blank")),
'<option disabled="disabled">---------</option>',
]
)
Expand Down Expand Up @@ -179,45 +181,45 @@
'<option data-additional-fieldset="additional-fieldset" value="like"></option>'
)
.prop("selected", field_operator == "like")
.text(RailsAdmin.I18n.t("contains"))
.text(I18n.t("contains"))
)
.append(
$(
'<option data-additional-fieldset="additional-fieldset" value="not_like"></option>'
)
.prop("selected", field_operator == "not_like")
.text(RailsAdmin.I18n.t("does_not_contain"))
.text(I18n.t("does_not_contain"))
)
.append(
$(
'<option data-additional-fieldset="additional-fieldset" value="is"></option>'
)
.prop("selected", field_operator == "is")
.text(RailsAdmin.I18n.t("is_exactly"))
.text(I18n.t("is_exactly"))
)
.append(
$(
'<option data-additional-fieldset="additional-fieldset" value="starts_with"></option>'
)
.prop("selected", field_operator == "starts_with")
.text(RailsAdmin.I18n.t("starts_with"))
.text(I18n.t("starts_with"))
)
.append(
$(
'<option data-additional-fieldset="additional-fieldset" value="ends_with"></option>'
)
.prop("selected", field_operator == "ends_with")
.text(RailsAdmin.I18n.t("ends_with"))
.text(I18n.t("ends_with"))
);
if (!required) {
control.append([
'<option disabled="disabled">---------</option>',
$('<option value="_present"></option>')
.prop("selected", field_operator == "_present")
.text(RailsAdmin.I18n.t("is_present")),
.text(I18n.t("is_present")),
$('<option value="_blank"></option>')
.prop("selected", field_operator == "_blank")
.text(RailsAdmin.I18n.t("is_blank")),
.text(I18n.t("is_blank")),
]);
}
additional_control = $(
Expand All @@ -244,24 +246,24 @@
'<option data-additional-fieldset="default" value="default"></option>'
)
.prop("selected", field_operator == "default")
.text(RailsAdmin.I18n.t("number"))
.text(I18n.t("number"))
)
.append(
$(
'<option data-additional-fieldset="between" value="between"></option>'
)
.prop("selected", field_operator == "between")
.text(RailsAdmin.I18n.t("between_and_"))
.text(I18n.t("between_and_"))
);
if (!required) {
control.append([
'<option disabled="disabled">---------</option>',
$('<option value="_not_null"></option>')
.prop("selected", field_operator == "_not_null")
.text(RailsAdmin.I18n.t("is_present")),
.text(I18n.t("is_present")),
$('<option value="_null"></option>')
.prop("selected", field_operator == "_null")
.text(RailsAdmin.I18n.t("is_blank")),
.text(I18n.t("is_blank")),
]);
}
additional_control = $(
Expand Down Expand Up @@ -331,7 +333,7 @@
$content.find(".date, .datetime").each(function () {
$(this).datetimepicker({
date: moment($(this).siblings("[type=hidden]").val()),
locale: RailsAdmin.I18n.locale,
locale: I18n.locale,
showTodayButton: true,
format: options["datetimepicker_format"],
});
Expand Down Expand Up @@ -365,7 +367,7 @@

$(document).on("click", "#filters_box .delete", function (e) {
e.preventDefault();
form = $(this).parents("form");
var form = $(this).parents("form");
$(this).parents(".filter").remove();
!$("#filters_box").children().length &&
$("hr.filters_box:visible").hide("slow");
Expand All @@ -387,7 +389,8 @@
"#filters_box .switch-additional-fieldsets",
function (e) {
var selected_option = $(this).find("option:selected");
if ((klass = $(selected_option).data("additional-fieldset"))) {
var klass = $(selected_option).data("additional-fieldset");
if (klass) {
$(this)
.siblings(".additional-fieldset:not(." + klass + ")")
.hide("slow");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
/*
* RailsAdmin filtering multiselect @VERSION
*
* License
*
* http://www.railsadmin.org
*
* Depends:
* jquery.ui.core.js
* jquery.ui.widget.js
*/
import jQuery from "jquery";
import "jquery-ui/ui/widget";
import I18n from "./i18n";

(function ($) {
$.widget("ra.filteringMultiselect", {
_cache: {},
Expand Down Expand Up @@ -152,10 +145,10 @@
this.element.css({ display: "none" });

this.tooManyObjectsPlaceholder = $('<option disabled="disabled" />').text(
RailsAdmin.I18n.t("too_many_objects")
I18n.t("too_many_objects")
);
this.noObjectsPlaceholder = $('<option disabled="disabled" />').text(
RailsAdmin.I18n.t("no_objects")
I18n.t("no_objects")
);

if (this.options.xhr) {
Expand Down Expand Up @@ -301,7 +294,7 @@
if (!this.options.xhr) {
for (i in this._cache) {
if (this._cache.hasOwnProperty(i)) {
option = this._cache[i];
var option = this._cache[i];
matches.push({ id: option.id, label: option.value });
}
}
Expand All @@ -327,7 +320,7 @@
this._cache.hasOwnProperty(i) &&
query.test(this._cache[i]["value"])
) {
option = this._cache[i];
var option = this._cache[i];
matches.push({ id: option.id, label: option.value });
}
}
Expand Down
Loading

0 comments on commit ef4ed79

Please sign in to comment.