From 679abd34985686f3fe392c6a63f775d6664903d2 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Mon, 14 Oct 2013 14:10:11 -0400
Subject: [PATCH] move karma config to top level

---
 karma.conf.js        | 79 ++++++++++++++++++++++++++++++++++++++++++++
 src/modules/modal.js | 17 +++++-----
 2 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100755 karma.conf.js

diff --git a/karma.conf.js b/karma.conf.js
new file mode 100755
index 000000000..2879601d2
--- /dev/null
+++ b/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
+  });
+};
diff --git a/src/modules/modal.js b/src/modules/modal.js
index aa52e6023..42b28beca 100755
--- a/src/modules/modal.js
+++ b/src/modules/modal.js
@@ -27,13 +27,12 @@ $.fn.modal = function(parameters) {
     invokedResponse
   ;
 
-
   $allModules
-    .each(function() {
+    .each(function(index) {
       var
         settings    = ( $.isPlainObject(parameters) )
           ? $.extend(true, {}, $.fn.modal.settings, parameters)
-          : $.fn.modal.settings,
+          : $.extend(true, {}, $.fn.modal.settings),
 
         selector        = settings.selector,
         className       = settings.className,
@@ -44,17 +43,17 @@ $.fn.modal = function(parameters) {
         moduleNamespace = 'module-' + namespace,
         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,
         $dimmable,
         $dimmer,
 
-        element      = this,
-        instance     = $module.data(moduleNamespace),
+        element         = this,
+        instance        = $module.data(moduleNamespace),
         module
       ;