diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-01-15 20:41:57 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-01-15 20:41:57 +0100 |
| commit | 1b671afa17b3735a2b78ebca8a5093c5c040c7a2 (patch) | |
| tree | 63af6ebd537334e7bbcd6712d944312f3dd27806 | |
| parent | 9b4d5b502fcdba004c3ee95dd6d395f437a5e5dc (diff) | |
| parent | dc17019536551915e4417b08904e9fb5f6f49689 (diff) | |
| download | nextcloud-server-1b671afa17b3735a2b78ebca8a5093c5c040c7a2.tar.gz nextcloud-server-1b671afa17b3735a2b78ebca8a5093c5c040c7a2.zip | |
Merge pull request #13323 from owncloud/move-search
Move search to core/search
| -rw-r--r-- | core/js/core.json | 2 | ||||
| -rw-r--r-- | core/js/js.js | 2 | ||||
| -rw-r--r-- | core/routes.php | 4 | ||||
| -rw-r--r-- | core/search/ajax/search.php (renamed from search/ajax/search.php) | 0 | ||||
| -rw-r--r-- | core/search/css/results.css (renamed from search/css/results.css) | 0 | ||||
| -rw-r--r-- | core/search/js/search.js (renamed from search/js/search.js) | 6 | ||||
| -rw-r--r-- | core/search/templates/part.results.html (renamed from search/templates/part.results.html) | 0 |
7 files changed, 7 insertions, 7 deletions
diff --git a/core/js/core.json b/core/js/core.json index 101a88cd4f0..2fb7842624c 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -23,6 +23,6 @@ "config.js", "multiselect.js", "oc-requesttoken.js", - "../../search/js/search.js" + "../search/js/search.js" ] } diff --git a/core/js/js.js b/core/js/js.js index 579bf09b2e4..234cc328dfb 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -74,7 +74,7 @@ var OC={ config: window.oc_config, appConfig: window.oc_appconfig || {}, theme: window.oc_defaults || {}, - coreApps:['', 'admin','log','search','settings','core','3rdparty'], + coreApps:['', 'admin','log','core/search','settings','core','3rdparty'], menuSpeed: 100, /** diff --git a/core/routes.php b/core/routes.php index ced70898f50..defbb695a71 100644 --- a/core/routes.php +++ b/core/routes.php @@ -22,8 +22,8 @@ $application->registerRoutes($this, array('routes' => array( /** @var $this OCP\Route\IRouter */ // Core ajax actions // Search -$this->create('search_ajax_search', '/search/ajax/search.php') - ->actionInclude('search/ajax/search.php'); +$this->create('search_ajax_search', '/core/search') + ->actionInclude('core/search/ajax/search.php'); // AppConfig $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php') ->actionInclude('core/ajax/appconfig.php'); diff --git a/search/ajax/search.php b/core/search/ajax/search.php index 2bafe65302b..2bafe65302b 100644 --- a/search/ajax/search.php +++ b/core/search/ajax/search.php diff --git a/search/css/results.css b/core/search/css/results.css index 04f7b6dcb99..04f7b6dcb99 100644 --- a/search/css/results.css +++ b/core/search/css/results.css diff --git a/search/js/search.js b/core/search/js/search.js index 57de07bf7fd..c6542ffc138 100644 --- a/search/js/search.js +++ b/core/search/js/search.js @@ -97,7 +97,7 @@ */ this.search = function(query, inApps, page, size) { if (query) { - OC.addStyle('search','results'); + OC.addStyle('core/search','results'); if (typeof page !== 'number') { page = 1; } @@ -128,7 +128,7 @@ $status.html(t('core', 'Searching other places')+'<img class="spinner" alt="search in progress" src="'+OC.webroot+'/core/img/loading.gif" />'); // do the actual search query - $.getJSON(OC.generateUrl('search/ajax/search.php'), {query:query, inApps:inApps, page:page, size:size }, function(results) { + $.getJSON(OC.generateUrl('core/search'), {query:query, inApps:inApps, page:page, size:size }, function(results) { lastResults = results; if (page === 1) { showResults(results); @@ -364,7 +364,7 @@ $(document).ready(function() { $('#app-content') .append($searchResults) .find('.viewcontainer').css('min-height', 'initial'); - $searchResults.load(OC.webroot + '/search/templates/part.results.html', function () { + $searchResults.load(OC.webroot + '/core/search/templates/part.results.html', function () { OC.Search = new OCA.Search($('#searchbox'), $('#searchresults')); }); }); diff --git a/search/templates/part.results.html b/core/search/templates/part.results.html index 612d02c18f8..612d02c18f8 100644 --- a/search/templates/part.results.html +++ b/core/search/templates/part.results.html |