Skip to content

Commit

Permalink
local js hyrax files, working, tests passing
Browse files Browse the repository at this point in the history
  • Loading branch information
jenlindner committed Jun 6, 2017
1 parent 1cfa670 commit 96d2f27
Show file tree
Hide file tree
Showing 11 changed files with 139 additions and 318 deletions.
13 changes: 12 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
sudo: required
dist: trusty
language: ruby
cache: bundler
sudo: false
Expand All @@ -12,4 +14,13 @@ before_script:
- bundle exec rake db:create
script:
- bundle exec rubocop
- bundle exec rake ci
- xvfb-run -a bundle exec rake ci
env:
- QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
addons:
apt:
packages:
- qt5-default
- libqt5webkit5-dev
- gstreamer1.0-plugins-base
- gstreamer1.0-tools gstreamer1.0-x
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ gem 'turbolinks', '~> 5'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'yard'
gem 'xray-rails'
gem 'yard'

group :development, :test do
gem 'bixby' # bixby == the hydra community's rubocop rules
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/about_me_save.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Blacklight.onLoad(function() {
$("#about_me_and_my_program").on("click", function(event) {
$('#new_etd').append('<input name="about_me" value="true" id="about_me" type="hidden" />');
alert($('#new_etd').html());
event.preventDefault();
$.ajax({
type: "POST",
Expand Down
10 changes: 5 additions & 5 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
// Required by Blacklight
//= require blacklight/blacklight

//= require blacklight_gallery
//= require cable
//= require about_me_save
//= require tab_info
//= require openseadragon
//= require hyrax
//= require etd
//= require initialize
//= require editor
//= require etd_save_work_control

// Provide AMD module support
//= require almond
48 changes: 0 additions & 48 deletions app/assets/javascripts/editor.es6

This file was deleted.

17 changes: 0 additions & 17 deletions app/assets/javascripts/etd.js

This file was deleted.

141 changes: 0 additions & 141 deletions app/assets/javascripts/etd_save_work_control.es6

This file was deleted.

11 changes: 11 additions & 0 deletions app/assets/javascripts/hyrax/app.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
// Hyrax.editor = () => {
// var AdminSetControls = require('hyrax/admin/admin_set_controls')
// var MyAdminSetControls = require('my_admin_set_controls')
// var controls = new MyAdminSetControls($('#admin-set-controls'))
// console.log("Init'ng my controls")
// }





// Once, javascript is written in a modular format, all initialization
// code should be called from here.
Hyrax = {
Expand Down
Loading

0 comments on commit 96d2f27

Please sign in to comment.