Browse Source

move karma config to top level

pull/258/head
jlukic 11 years ago
parent
commit
679abd3498
2 changed files with 87 additions and 9 deletions
  1. 79
      karma.conf.js
  2. 17
      src/modules/modal.js

79
karma.conf.js

@ -0,0 +1,79 @@
// Karma configuration
module.exports = function(config) {
config.set({
// base path, that will be used to resolve files and exclude
basePath: '',
// frameworks to use
frameworks: [
'jasmine'
],
// list of files / patterns to load in the browser
files: [
// require jquery
'server/files/javascript/library/jquery.js',
// read css from compiled css
'docs/build/uncompressed/**/*.css',
// read js from src js
'src/**/*.js',
// require helpers
'test/helpers/*.js',
// require fixtures
{
pattern : 'test/fixtures/*.html',
watched : true,
included : false,
served : true
},
// require tests
'test/modules/*.js'
],
// list of files to exclude
exclude: [
'**/*.swp',
'karma.conf.js'
],
preprocessors: {
'**/*.html': []
},
// test results reporter to use
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
reporters: ['spec'],
// web server port
port: 9999,
// enable / disable colors in the output (reporters and logs)
colors: true,
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes
autoWatch: true,
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers: ['PhantomJS'],
// If browser does not capture in given timeout [ms], kill it
captureTimeout: 60000,
// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: false
});
};

17
src/modules/modal.js

@ -27,13 +27,12 @@ $.fn.modal = function(parameters) {
invokedResponse invokedResponse
; ;
$allModules $allModules
.each(function() {
.each(function(index) {
var var
settings = ( $.isPlainObject(parameters) ) settings = ( $.isPlainObject(parameters) )
? $.extend(true, {}, $.fn.modal.settings, parameters) ? $.extend(true, {}, $.fn.modal.settings, parameters)
: $.fn.modal.settings,
: $.extend(true, {}, $.fn.modal.settings),
selector = settings.selector, selector = settings.selector,
className = settings.className, className = settings.className,
@ -44,17 +43,17 @@ $.fn.modal = function(parameters) {
moduleNamespace = 'module-' + namespace, moduleNamespace = 'module-' + namespace,
moduleSelector = $allModules.selector || '', moduleSelector = $allModules.selector || '',
$module = $(this),
$context = $(settings.context),
$otherModals = $allModules.not($module),
$close = $module.find(selector.close),
$module = $(this),
$context = $(settings.context),
$otherModals = $allModules.not($module),
$close = $module.find(selector.close),
$focusedElement, $focusedElement,
$dimmable, $dimmable,
$dimmer, $dimmer,
element = this,
instance = $module.data(moduleNamespace),
element = this,
instance = $module.data(moduleNamespace),
module module
; ;

Loading…
Cancel
Save