fiddle with javascripts and add sprockets manifest file
This commit is contained in:
parent
6d187f556a
commit
2e49701dea
4 changed files with 16 additions and 11 deletions
6
app/assets/config/manifest.js
Normal file
6
app/assets/config/manifest.js
Normal file
|
@ -0,0 +1,6 @@
|
|||
// JS and CSS bundles
|
||||
//= link_directory ../javascripts .js
|
||||
//= link_directory ../stylesheets .css
|
||||
|
||||
// Other
|
||||
//= link_tree ../images
|
|
@ -16,6 +16,9 @@
|
|||
//= require ./orderedLibraries/underscore
|
||||
//= require ./orderedLibraries/backbone
|
||||
//= require_directory ./lib
|
||||
//= require_directory ./shims
|
||||
//= require_directory ./require
|
||||
//= require_directory ./famous
|
||||
//= require ./src/Metamaps.GlobalUI
|
||||
//= require ./src/Metamaps.Router
|
||||
//= require ./src/Metamaps.Backbone
|
||||
|
@ -44,6 +47,3 @@
|
|||
//= require ./src/Metamaps.Admin
|
||||
//= require ./src/Metamaps.Import
|
||||
//= require ./src/Metamaps.JIT
|
||||
//= require_directory ./shims
|
||||
//= require_directory ./require
|
||||
//= require_directory ./famous
|
||||
|
|
|
@ -320,5 +320,3 @@ Metamaps.Import = {
|
|||
Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true)
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Metamaps.Import
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
var chai = require('chai')
|
||||
var expect = chai.expect
|
||||
/* global describe, it */
|
||||
const chai = require('chai')
|
||||
const expect = chai.expect
|
||||
|
||||
Metamaps = {}
|
||||
Metamaps.Import = require('../src/Metamaps.Import')
|
||||
const Metamaps = {}
|
||||
require('../src/Metamaps.Import')
|
||||
|
||||
describe('Metamaps.Import.js', function() {
|
||||
it('has a topic whitelist', function() {
|
||||
describe('Metamaps.Import.js', function () {
|
||||
it('has a topic whitelist', function () {
|
||||
expect(Metamaps.Import.topicWhitelist).to.deep.equal(
|
||||
['id', 'name', 'metacode', 'x', 'y', 'description', 'link', 'permission']
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue