Skip to content

Commit

Permalink
Adding Magic Search codebase to Horizon
Browse files Browse the repository at this point in the history
Magic Search is getting integrated into the Horizon codebase as agreed
at the Tokyo summit.  This Magic Search patch replaces the XStatic
package with its own module, and otherwise works as the current XStatic
package (changes will be made to accommodate Searchlight features in
following patches).  This is not simply a copy of what is in GitHub,
because there were no tests and little documentation.

The code underwent significant restructuring to accommodate the linter and
other standards used in Horizon.

Change-Id: I9a2b0f3fed1955680a534e8d284da2c8ee68ef16
Implements: blueprint integrate-magic-search
  • Loading branch information
Matt Borland authored and matthew-borland committed Jan 29, 2016
1 parent 597dbce commit 85d44f9
Show file tree
Hide file tree
Showing 18 changed files with 1,908 additions and 531 deletions.
3 changes: 0 additions & 3 deletions horizon/karma.conf.js
Expand Up @@ -100,9 +100,6 @@ module.exports = function (config) {
*/
'!(horizon)/**/!(*.spec|*.mock).js',

// Magic search requires late ordering due to overriding.
xstaticPath + 'magic_search/data/magic_search.js',

/**
* Then, list files for mocks with `mock.js` extension. The order
* among them should not be significant.
Expand Down
Expand Up @@ -15,7 +15,7 @@
'use strict';

angular
.module('MagicSearch')
.module('horizon.framework.widgets.magic-search')
.directive('hzMagicSearchBar', hzMagicSearchBar);

hzMagicSearchBar.$inject = ['horizon.framework.widgets.basePath'];
Expand Down
Expand Up @@ -23,7 +23,7 @@
beforeEach(module('templates'));
beforeEach(module('smart-table'));
beforeEach(module('horizon.framework'));
beforeEach(module('MagicSearch'));
beforeEach(module('horizon.framework.widgets.magic-search'));

beforeEach(inject(function ($injector) {
$compile = $injector.get('$compile');
Expand Down

This file was deleted.

0 comments on commit 85d44f9

Please sign in to comment.