glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fiddle with javascripts and add sprockets manifest file

Browse source
This commit is contained in:
Devin Howard 2016-07-01 15:17:49 +08:00
parent 6d187f556a
commit 2e49701dea
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/config/manifest.js Normal file
View file

@ -0,0 +1,6 @@
// JS and CSS bundles
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
// Other
//= link_tree ../images

6
app/assets/javascripts/application.js
View file

@ -16,6 +16,9 @@
//= require ./orderedLibraries/underscore //= require ./orderedLibraries/underscore
//= require ./orderedLibraries/backbone //= require ./orderedLibraries/backbone
//= require_directory ./lib //= require_directory ./lib
//= require_directory ./shims
//= require_directory ./require
//= require_directory ./famous
//= require ./src/Metamaps.GlobalUI //= require ./src/Metamaps.GlobalUI
//= require ./src/Metamaps.Router //= require ./src/Metamaps.Router
//= require ./src/Metamaps.Backbone //= require ./src/Metamaps.Backbone
@ -44,6 +47,3 @@
//= require ./src/Metamaps.Admin //= require ./src/Metamaps.Admin
//= require ./src/Metamaps.Import //= require ./src/Metamaps.Import
//= require ./src/Metamaps.JIT //= require ./src/Metamaps.JIT
//= require_directory ./shims
//= require_directory ./require
//= require_directory ./famous

2
app/assets/javascripts/src/Metamaps.Import.js
View file

@ -320,5 +320,3 @@ Metamaps.Import = {
Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true) Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true)
} }
} }
module.exports = Metamaps.Import

13
app/assets/javascripts/test/Metamaps.Import.spec.js
View file

@ -1,11 +1,12 @@
var chai = require('chai') /* global describe, it */
var expect = chai.expect const chai = require('chai')
const expect = chai.expect
Metamaps = {} const Metamaps = {}
Metamaps.Import = require('../src/Metamaps.Import') require('../src/Metamaps.Import')
describe('Metamaps.Import.js', function() { describe('Metamaps.Import.js', function () {
it('has a topic whitelist', function() { it('has a topic whitelist', function () {
expect(Metamaps.Import.topicWhitelist).to.deep.equal( expect(Metamaps.Import.topicWhitelist).to.deep.equal(
['id', 'name', 'metacode', 'x', 'y', 'description', 'link', 'permission'] ['id', 'name', 'metacode', 'x', 'y', 'description', 'link', 'permission']
) )