Merge pull request #68 from SlateFoundation/development

SlateAdmin release v2.1.0
SlateFoundation · Sep 10, 2015 · 44bcc7a · 44bcc7a
2 parents 7d2eec4 + 17ead23
commit 44bcc7a
Show file tree

Hide file tree

Showing 64 changed files with 2,385 additions and 2,507 deletions.
diff --git a/sencha-workspace/SlateAdmin/app/Application.js b/sencha-workspace/SlateAdmin/app/Application.js
@@ -49,10 +49,10 @@ Ext.define('SlateAdmin.Application', {
         'progress.Standards',
         'progress.Worksheets',
         'progress.Narratives',
-        'progress.Interims'
+        'progress.Interims',
 
         //<debug>
-        ,'DeveloperTools'
+        'DeveloperTools'
         //</debug>
     ],
 

diff --git a/sencha-workspace/SlateAdmin/app/controller/Progress.js b/sencha-workspace/SlateAdmin/app/controller/Progress.js
@@ -2,9 +2,6 @@
 Ext.define('SlateAdmin.controller.Progress', {
     extend: 'Ext.app.Controller',
 
-//    requires: [
-//        'SlateAdmin.proxy.Records'
-//    ],
     // controller config
     views: [
         'progress.NavPanel'
@@ -23,24 +20,19 @@ Ext.define('SlateAdmin.controller.Progress', {
     }],
 
 
-    // controller template methods
-    init: function() {
-        var me = this;
-
-        me.control({
-            'progress-navpanel': {
-                expand: me.onNavPanelExpand
-            }
-        });
+    control: {
+        'progress-navpanel': {
+            expand: 'onNavPanelExpand'
+        }
     },
 
-    buildNavPanel: function() {
+    buildNavPanel: function () {
         return location.search.match(/\Wenablesbg(\W|$)/) && this.getNavPanel();
     },
 
 
     // route handlers
-    showProgress: function() {
+    showProgress: function () {
         var me = this,
             navPanel = me.getNavPanel();
 
@@ -50,17 +42,17 @@ Ext.define('SlateAdmin.controller.Progress', {
 
 
     // event handlers
-    onNavPanelExpand: function(navPanel) {
+    onNavPanelExpand: function (navPanel) {
         Ext.util.History.pushState('progress', 'Student Progress');
     },
 
 
     // controller methods
-    syncState: function() {
+    syncState: function () {
         var path = ['progress'],
             title = 'Progress',
             activeLink = this.getNavPanel().getActiveLink();
-        console.log('syncState, activeLink = ', activeLink);
+
         Ext.util.History.pushState(path, title);
     }
 });
diff --git a/sencha-workspace/SlateAdmin/app/controller/people/Contacts.js b/sencha-workspace/SlateAdmin/app/controller/people/Contacts.js
@@ -435,7 +435,7 @@ Ext.define('SlateAdmin.controller.people.Contacts', {
 
         Ext.Msg.confirm('Delete contact point', Ext.String.format('Are you sure you want to delete the contact point labeled "{0}"?', record.get('Label')), function(btn) {
             if (btn == 'yes') {
-                record.destroy();
+                record.erase();
             }
         });
     },