Skip to content

Commit

Permalink
Add Travis & Update JS Dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Jadon Fowler <[email protected]>
  • Loading branch information
phase committed Jul 17, 2018
1 parent dd505d4 commit c18b3f0
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 29 deletions.
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!-- Please fill out these fields: -->

* Browser: `Google Chrome`

* Operating System: `Windows 10`

* Error message (if applicable): `404`

* Page link: `https://ore.spongepowered.org/YOUR_LINK`

* Steps to reproduce:

* Step 1
* Step 2
* Step 3
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
sudo: false
notifications:
email: false

language: scala
jdk:
- oraclejdk8
- openjdk8

scala:
- 2.12.6

script:
- sbt ++$TRAVIS_SCALA_VERSION compile
11 changes: 0 additions & 11 deletions ISSUE_TEMPLATE.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Ore
Ore [![Build Status](https://travis-ci.org/SpongePowered/Ore.svg?branch=master)](https://travis-ci.org/SpongePowered/Ore)
===

Repository software for Sponge plugins and Forge mods https://ore.spongepowered.org/
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.0
sbt.version=1.1.6
27 changes: 22 additions & 5 deletions public/bootstrap/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

/*
* This document has been modified manually by the Ore team to include some fixes.
* https://github.com/twbs/bootstrap/pull/23687/commits/d9be1da55bf0f94a81e8a2c9acf5574fb801306e
*/

/*!
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=41f0c451d2a970ce2c0678933d1ec52b)
* Config saved to config.json and https://gist.github.com/41f0c451d2a970ce2c0678933d1ec52b
Expand Down Expand Up @@ -52,7 +57,8 @@ if (typeof jQuery === 'undefined') {
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
}

var $parent = $(selector)
selector = selector === '#' ? [] : selector
var $parent = $(document).find(selector)

if (e) e.preventDefault()

Expand Down Expand Up @@ -445,7 +451,14 @@ if (typeof jQuery === 'undefined') {
var clickHandler = function (e) {
var href
var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
var href = $this.attr('href')
if (href) {
href = href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
}

var target = $this.attr('data-target') || href
var $target = $(document).find(target)

if (!$target.hasClass('carousel')) return
var options = $.extend({}, $target.data(), $this.data())
var slideIndex = $this.attr('data-slide-to')
Expand Down Expand Up @@ -504,7 +517,7 @@ if (typeof jQuery === 'undefined') {
selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
}

var $parent = selector && $(selector)
var $parent = selector && $(document).find(selector)

return $parent && $parent.length ? $parent : $this.parent()
}
Expand Down Expand Up @@ -961,7 +974,11 @@ if (typeof jQuery === 'undefined') {
$(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
var $this = $(this)
var href = $this.attr('href')
var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
var target = $this.attr('data-target') ||
(href && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7

var $target = $(document).find(target)

var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())

if ($this.is('a')) e.preventDefault()
Expand Down Expand Up @@ -2081,7 +2098,7 @@ if (typeof jQuery === 'undefined') {
var target = $trigger.attr('data-target')
|| (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7

return $(target)
return $(document).find(target)
}


Expand Down
14 changes: 3 additions & 11 deletions public/bootstrap/js/bootstrap.min.js

Large diffs are not rendered by default.

0 comments on commit c18b3f0

Please sign in to comment.