Made default servers configurable via servers.json file in root directory.

Author: jrwdunham

Gruntfile.coffee

@@ -364,9 +364,15 @@ module.exports = (grunt) ->
       unicodedatajson:
         src: 'UnicodeData.json'
         dest: '.tmp/'
+      serversjson:
+        src: 'servers.json'
+        dest: '.tmp/'
       unicodedatajsondist:
         src: 'UnicodeData.json'
         dest: 'dist/'
+      serversjsondist:
+        src: 'servers.json'
+        dest: 'dist/'
       dist:
         files: [
           expand: true
@@ -384,6 +390,7 @@ module.exports = (grunt) ->
             'help/html/help.html'
             './../package.json'
             './../.tmp/UnicodeData.json'
+            './../.tmp/servers.json'
             'images/{,*/}*.{webp,gif,png,jpg}' # added png so that my jQuery images in /images would copy over, cf. imagemin headache
             'styles/fonts/{,*/}*.*'
             'bower_components/sass-bootstrap/fonts/*.*'
@@ -544,6 +551,7 @@ module.exports = (grunt) ->
         'copy:coffee'
         'copy:packagejson'
         'copy:unicodedatajson'
+        'copy:serversjson'
         'coffee:serve'
         'coffee:test'
         #'createDefaultTemplate'
@@ -561,6 +569,7 @@ module.exports = (grunt) ->
       'copy:coffee'
       'copy:packagejson'
       'copy:unicodedatajson'
+      'copy:serversjson'
       'coffee:serve'
       #'createDefaultTemplate'
       #'jst'
@@ -598,6 +607,7 @@ module.exports = (grunt) ->
     'copy:coffee' # copy all .coffee files in app/scripts/ to .tmp/scripts/
     'copy:packagejson'
     'copy:unicodedatajson'
+    'copy:serversjson'
     'coffee:dist' # convert all .coffee files in .tmp/scripts to .js in situ
 
     # eco: convert all .eco files in app/scripts/templates/ to .js files in
@@ -669,6 +679,7 @@ module.exports = (grunt) ->
     'copy:dist'
 
     'copy:unicodedatajsondist'
+    'copy:serversjsondist'
   ]
 
   grunt.registerTask 'default', ['jshint', 'test', 'build']

app/index.html

@@ -6,10 +6,10 @@
         <title>Dative</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <!-- <link id="font-awesome-css" rel="stylesheet" type="text/css"
-          href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.css"> -->
         <link id="font-awesome-css" rel="stylesheet" type="text/css"
-          href="/styles/font-awesome-4.4.0/css/font-awesome.css">
+          href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.css">
+        <!-- <link id="font-awesome-css" rel="stylesheet" type="text/css"
+          href="/styles/font-awesome-4.4.0/css/font-awesome.css">-->
 
         <!-- Enable dynamic loading of jquery ui themes by the user -->
         <link id="jquery-ui-css" rel="stylesheet"

app/scripts/models/application-settings.coffee

@@ -239,7 +239,9 @@ define [
           JSON.parse(localStorage.getItem(@localStorageKey))
         applicationSettingsObject = @backbonify applicationSettingsObject
         @set applicationSettingsObject
+        @usingDefaults = false
       else
+        @usingDefaults = true
         @save()
 
     # Logout
@@ -434,6 +436,8 @@ define [
 
     defaults: ->
 
+      # Moving to specifying default servers at runtime using servers.json
+
       server1Object = new FieldDB.Connection(FieldDB.Connection.defaultConnection('localhost'))
       server1 =
         new ServerModel
@@ -476,10 +480,11 @@ define [
           corpusServerURL: null
           website: 'http://www.onlinelinguisticdatabase.org'
 
-      if window.location.hostname in ["localhost", '127.0.0.1']
-        servers = new ServersCollection([server1, server2, server3, server4])
-      else
-        servers = new ServersCollection([server3, server4])
+      # if window.location.hostname in ["localhost", '127.0.0.1']
+      #   servers = new ServersCollection([server1, server2, server3, server4])
+      # else
+      #   servers = new ServersCollection([server3, server4])
+      servers = new ServersCollection([server2])
 
       parserTaskSetModel = new ParserTaskSetModel()
 

app/scripts/views/app.coffee

@@ -69,6 +69,7 @@ define [
   './../models/page'
   './../models/phonology'
   './../models/search'
+  './../models/server'
   './../models/source'
   './../models/speaker'
   './../models/subcorpus'
@@ -89,6 +90,7 @@ define [
   './../collections/pages'
   './../collections/phonologies'
   './../collections/searches'
+  './../collections/servers'
   './../collections/sources'
   './../collections/speakers'
   './../collections/subcorpora'
@@ -117,16 +119,16 @@ define [
   ApplicationSettingsModel, CollectionModel, ElicitationMethodModel, FileModel,
   FormModel, LanguageModelModel, LanguageModel, MorphologicalParserModel,
   MorphologyModel, OLDApplicationSettingsModel, OrthographyModel, PageModel,
-  PhonologyModel, SearchModel, SourceModel, SpeakerModel, SubcorpusModel,
-  SyntacticCategoryModel, TagModel, UserModel,
+  PhonologyModel, SearchModel, ServerModel, SourceModel, SpeakerModel,
+  SubcorpusModel, SyntacticCategoryModel, TagModel, UserModel,
 
   CollectionsCollection, ElicitationMethodsCollection, FilesCollection,
   FormsCollection, LanguageModelsCollection, LanguagesCollection,
   MorphologicalParsersCollection, MorphologiesCollection,
   OrthographiesCollection, OLDApplicationSettingsCollection, PagesCollection,
-  PhonologiesCollection, SearchesCollection, SourcesCollection,
-  SpeakersCollection, SubcorporaCollection, SyntacticCategoriesCollection,
-  TagsCollection, UsersCollection,
+  PhonologiesCollection, SearchesCollection, ServersCollection,
+  SourcesCollection, SpeakersCollection, SubcorporaCollection,
+  SyntacticCategoriesCollection, TagsCollection, UsersCollection,
 
   globals, appTemplate) ->
 
@@ -146,6 +148,10 @@ define [
     initialize: (options) ->
       @preventParentScroll()
       @getApplicationSettings options
+      @fetchServers()
+
+    # Continue initialization after fetching servers.json
+    initializeContinue: ->
       globals.applicationSettings = @applicationSettings
       @overrideFieldDBNotificationHooks()
       @initializePersistentSubviews()
@@ -479,6 +485,39 @@ define [
       else
         @applicationSettings = new ApplicationSettingsModel()
 
+    # We have fetched the default servers array from the server hosting this
+    # Dative.
+    addDefaultServers: (serversArray) ->
+      serverModelsArray = []
+      for s in serversArray
+        s.id = @guid()
+        serverModelsArray.push(new ServerModel(s))
+      serversCollection = new ServersCollection(serverModelsArray)
+      activeServer = serversCollection.at 0
+      @applicationSettings.set 'servers', serversCollection
+      @applicationSettings.set 'activeServer', activeServer
+      @applicationSettings.save()
+      @initializeContinue()
+
+    # Fetch servers.json. This is a JSON object that contains an array of
+    # server objects. This allows the default list of (OLD/FieldDB) servers
+    # that this Dative knows about to be specified at runtime.
+    fetchServers: ->
+      if @applicationSettings.usingDefaults
+        url = 'servers.json'
+        $.ajax
+          url: url
+          type: 'GET'
+          dataType: 'json'
+          error: (jqXHR, textStatus, errorThrown) ->
+            console.log "Ajax request for #{url} threw an error:
+              #{errorThrown}"
+            @initializeContinue()
+          success: (serversArray, textStatus, jqXHR) =>
+            @addDefaultServers serversArray
+      else
+        @initializeContinue()
+
     # Size the #appview div relative to the window size
     matchWindowDimensions: ->
       @$('#appview').css height: $(window).height() - 50

app/scripts/views/server.coffee

@@ -126,7 +126,6 @@ define [
         .tooltip content: 'make this server the active one'
 
     activateServer: ->
-      console.log 'activateServer of ServerView'
       # The ApplicationSettingsView changes the active server.
       Backbone.trigger 'activateServer', @model.get('id')
 

servers.json

@@ -0,0 +1,11 @@
+[
+    {
+        "name": "OLD Local Development",
+        "type": "OLD",
+        "url": "http://127.0.0.1:5000",
+        "serverCode": null,
+        "corpusServerURL": null,
+        "website": "http://www.onlinelinguisticdatabase.org"
+    }
+]
+