Skip to content

Commit

Permalink
chore: rename master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
Marten Klitzke committed Jun 18, 2020
1 parent ddc50c8 commit 90faee3
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# https://github.com/bbatsov/rubocop/blob/master/config/default.yml
AllCops:
Exclude:
- 'node_modules/**/*'
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# DynamicFieldsForRails
[![Build Status](https://travis-ci.org/mortik/dynamic_fields_for_rails.png?branch=master)](https://travis-ci.org/mortik/dynamic_fields_for_rails)
[![Gem Version](https://badge.fury.io/rb/dynamic_fields_for_rails.png)](http://badge.fury.io/rb/dynamic_fields_for_rails)
[![Dependency Status](https://gemnasium.com/mortik/dynamic_fields_for_rails.png)](https://gemnasium.com/mortik/dynamic_fields_for_rails)

Expand Down
3 changes: 0 additions & 3 deletions test/dummy/config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

en:
hello: "Hello world"
6 changes: 3 additions & 3 deletions test/dummy/public/javascripts/effects.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ var Effect = {
speed: 0.1,
delay: 0.0
}, arguments[2] || { });
var masterDelay = options.delay;
var mainDelay = options.delay;

$A(elements).each( function(element, index) {
new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
new effect(element, Object.extend(options, { delay: index * options.speed + mainDelay }));
});
},
PAIRS: {
Expand Down Expand Up @@ -1120,4 +1120,4 @@ $w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTex
function(f) { Effect.Methods[f] = Element[f]; }
);

Element.addMethods(Effect.Methods);
Element.addMethods(Effect.Methods);

0 comments on commit 90faee3

Please sign in to comment.