Yoji SHIDARA
null+****@clear*****
Tue Sep 25 19:05:03 JST 2012
Yoji SHIDARA 2012-09-25 19:05:03 +0900 (Tue, 25 Sep 2012) New Revision: 62c7228e078c29ca2fdebfb6b377c240960b9cd8 https://github.com/groonga/gcs/commit/62c7228e078c29ca2fdebfb6b377c240960b9cd8 Log: Move searchEndpoint method into App.Domain Modified files: public/js/gcs.js Modified: public/js/gcs.js (+9 -11) =================================================================== --- public/js/gcs.js 2012-09-25 18:51:35 +0900 (8a59c23) +++ public/js/gcs.js 2012-09-25 19:05:03 +0900 (3ed65c7) @@ -13,6 +13,9 @@ App.IndexView = Ember.View.extend({ App.currentDomain = Ember.Object.create(); App.Domain = Ember.Object.extend({ + searchEndpoint: function() { + return 'http://' + this.get('endpoint') + '/2011-02-01/search'; + }.property('endpoint') }); App.Domains = Ember.Object.extend({ @@ -137,19 +140,13 @@ App.SearchController = Ember.ArrayController.extend({ }); return content; }.property('data'), - searchEndpoint: function() { - var domain = this.get('domain'); - if (!domain) { - return ''; - } - return 'http://' + this.get('domain').endpoint + '/2011-02-01/search'; - }.property('domain'), urlForRawRequest: function() { - var searchEndpoint = this.get('searchEndpoint'); + var domain = this.get('domain'); + var searchEndpoint = domain.get('searchEndpoint'); var params = this.get('paramsForRequest'); var urlForRawRequest = searchEndpoint + '?' + jQuery.param(params); return urlForRawRequest; - }.property('paramsForRequest', 'searchEndpoint'), + }.property('paramsForRequest', 'domain'), paramsForRequest: function() { var domain = this.get('domain'); if (!domain) { @@ -163,16 +160,17 @@ App.SearchController = Ember.ArrayController.extend({ 'return-fields': returnFields }; return params; - }.property('query', 'perPage', 'start', 'searchEndpoint'), + }.property('query', 'perPage', 'start', 'domain'), reset: function() { this.set('data', null); this.set('start', 0); }, executeSearch: function() { var self = this; + var domain = this.get('domain'); $.ajax({ type: 'GET', - url: self.get('searchEndpoint'), + url: domain.get('searchEndpoint'), data: self.get('paramsForRequest'), dataType: 'jsonp', success: function(data) { -------------- next part -------------- HTML����������������������������... Descargar