fix merge

modules/container-client/grunt/config/devEditor.coffee

@@ -5,23 +5,24 @@ _ = require 'lodash'
 
 editorSrcs = [
   'bower_components/angular-animate/angular-animate(.min).js',
+  'bower_components/angular-bootstrap/ui-bootstrap-tpls(.min).js',
   'bower_components/angular-route/angular-route(.min).js',
+  'bower_components/angular-ui-ace/ui-ace(.min).js',
   'bower_components/angular-ui-router/release/angular-ui-router(.min).js',
-  'bower_components/wiggi-wiz/dist/wiggi-wiz.js',
-  'bower_components/select2/select2(.min).js',
   'bower_components/angular-ui-select2/src/select2.js',
   'bower_components/angular-ui/build/angular-ui(.min).js',
-  'bower_components/angular-bootstrap/ui-bootstrap-tpls(.min).js',
-  'bower_components/angular-ui-ace/ui-ace(.min).js',
   'bower_components/jquery.browser/dist/jquery.browser(.min).js',
+  'bower_components/select2/select2(.min).js',
   'bower_components/undo.js/undo.js',
+  'bower_components/wiggi-wiz/dist/wiggi-wiz.js',
   'js/corespring/core-library.js',
   'js/corespring/server/init-core-library.js',
   'js/dev-editor/**/*.js',
+  'js/editing/**/*.js',
   'js/editor/**/*.js',
-  'js/render/services/**/*.js',
-  'js/render/directives/**/*.js',
   'js/render/controllers/**/*.js'
+  'js/render/directives/**/*.js',
+  'js/render/services/**/*.js',
 ]
 
 exports.js =
@@ -51,6 +52,13 @@ exports.ngModules = _.union(player.ngModules, [
   'corespring-dev-editor.controllers',
   'corespring-dev-editor.directives',
   'corespring-dev-editor.services',
+  'corespring-editing.controllers',
+  'corespring-editing.directives',
+  'corespring-editing.services',
+  'corespring-editing.wiggi-wiz-features',
+  'corespring-editing.wiggi-wiz-features.cs-image',
+  'corespring-editing.wiggi-wiz-features.link',
+  'corespring-editing.wiggi-wiz-features.mathjax',
   'corespring-editor.controllers',
   'corespring-editor.directives',
   'corespring-editor.services',

modules/container-client/grunt/config/editor.coffee

@@ -5,27 +5,28 @@ _ = require 'lodash'
 
 editorSrcs = [
   'bower_components/angular-animate/angular-animate(.min).js',
+  'bower_components/angular-bootstrap/ui-bootstrap-tpls(.min).js',
+  'bower_components/angular-debounce/dist/angular-debounce(.min).js',
   'bower_components/angular-route/angular-route(.min).js',
+  'bower_components/angular-ui-ace/ui-ace(.min).js',
   'bower_components/angular-ui-router/release/angular-ui-router(.min).js',
-  'bower_components/wiggi-wiz/dist/wiggi-wiz.js',
-  'bower_components/select2/select2(.min).js',
   'bower_components/angular-ui-select2/src/select2.js',
   'bower_components/angular-ui/build/angular-ui(.min).js',
-  'bower_components/angular-ui-ace/ui-ace(.min).js',
-  'bower_components/angular-bootstrap/ui-bootstrap-tpls(.min).js',
-  'bower_components/angular-debounce/dist/angular-debounce(.min).js',
-  'bower_components/jquery.browser/dist/jquery.browser(.min).js',
-  'bower_components/undo.js/undo.js',
   'bower_components/corespring-checkbox/src/directive.js',
   'bower_components/corespring-radio/src/directive.js',
+  'bower_components/jquery.browser/dist/jquery.browser(.min).js',
+  'bower_components/select2/select2(.min).js',
+  'bower_components/undo.js/undo.js',
+  'bower_components/wiggi-wiz/dist/wiggi-wiz.js',
+  'js/catalog/**/*.js',
+  'js/common/**/*.js',
   'js/corespring/core-library.js',
   'js/corespring/server/init-core-library.js',
-  'js/common/**/*.js',
+  'js/editing/**/*.js',
   'js/editor/**/*.js',
-  'js/catalog/**/*.js',
-  'js/render/services/**/*.js',
-  'js/render/directives/**/*.js',
   'js/render/controllers/**/*.js'
+  'js/render/directives/**/*.js',
+  'js/render/services/**/*.js'
 ]
 
 exports.js =
@@ -53,6 +54,12 @@ exports.css =
 
 exports.ngModules = _.union(player.ngModules, [
   'corespring-common.supporting-materials',
+  'corespring-editing.controllers',
+  'corespring-editing.directives',
+  'corespring-editing.services',
+  'corespring-editing.wiggi-wiz-features.cs-image',
+  'corespring-editing.wiggi-wiz-features.link',
+  'corespring-editing.wiggi-wiz-features.mathjax',
   'corespring-editor.controllers',
   'corespring-editor.directives',
   'corespring-editor.profile.controllers',

modules/container-client/grunt/config/singleComponentEditor.coffee

@@ -7,27 +7,25 @@ baseName = "singleComponentEditor"
 
 editorSrcs = [
   'bower_components/angular-animate/angular-animate(.min).js',
-  'bower_components/wiggi-wiz/dist/wiggi-wiz.js',
-  'bower_components/undo.js/undo.js',
-  'bower_components/select2/select2(.min).js',
-  'bower_components/angular-ui-select2/src/select2.js',
-  'bower_components/angular-ui/build/angular-ui(.min).js',
-  'bower_components/angular-ui-ace/ui-ace(.min).js',
   'bower_components/angular-bootstrap/ui-bootstrap-tpls(.min).js',
   'bower_components/angular-debounce/dist/angular-debounce(.min).js',
-  'bower_components/jquery.browser/dist/jquery.browser(.min).js',
+  'bower_components/angular-ui-ace/ui-ace(.min).js',
+  'bower_components/angular-ui-select2/src/select2.js',
+  'bower_components/angular-ui/build/angular-ui(.min).js',
   'bower_components/corespring-checkbox/src/directive.js',
   'bower_components/corespring-radio/src/directive.js',
-  'js/corespring/core-library.js',
-  'js/corespring/server/init-core-library.js',
+  'bower_components/jquery.browser/dist/jquery.browser(.min).js',
+  'bower_components/select2/select2(.min).js',
+  'bower_components/undo.js/undo.js',
+  'bower_components/wiggi-wiz/dist/wiggi-wiz.js',
   'js/common/**/*.js',
-  # it would be better to pull out the js we need here instead
-  'js/rig/**/*.js',
-  'js/editor/**/*.js',
   'js/component-editor/**/*.js',
-  'js/render/services/**/*.js',
+  'js/corespring/core-library.js',
+  'js/corespring/server/init-core-library.js',
+  'js/editing/**/*.js',
+  'js/render/controllers/**/*.js',
   'js/render/directives/**/*.js',
-  'js/render/controllers/**/*.js'
+  'js/render/services/**/*.js'
 ]
 
 exports.js =
@@ -53,18 +51,18 @@ exports.css =
   report: "#{baseName}-css-report.json"
 
 exports.ngModules = _.union(player.ngModules, [
-  'corespring.wiggi-wiz',
-  'corespring-editor.directives',
-  'corespring-editor.controllers',
-  'corespring-rig.directives',
-  'corespring-editor.services',
-  'ui.bootstrap.tabs',
-  'ui.ace',
-  'wiggi-wiz.features.core',
-  'corespring.wiggi-wiz-features.mathjax',
-  'corespring.wiggi-wiz-features.link',
-  'corespring.wiggi-wiz-features.cs-image',
+  'corespring-editing.controllers',
+  'corespring-editing.directives',
+  'corespring-editing.services',
+  'corespring-editing.wiggi-wiz-features',
+  'corespring-editing.wiggi-wiz-features.cs-image',
+  'corespring-editing.wiggi-wiz-features.link',
+  'corespring-editing.wiggi-wiz-features.mathjax',
   'corespring-singleComponentEditor.controllers',
-  'corespring-singleComponentEditor.services',
   'corespring-singleComponentEditor.directives'
+  'corespring-singleComponentEditor.services',
+  'corespring.wiggi-wiz',
+  'ui.ace',
+  'ui.bootstrap.tabs',
+  'wiggi-wiz.features.core'
 ])

modules/container-client/src/css/single-component-editor.less

@@ -2,11 +2,9 @@
 @import "../bower_components/bootstrap/less/bootstrap";
 @import "../components/wiggi-wiz/dist/wiggi-wiz.css";
 @import "../components/components-font-awesome/css/font-awesome.css";
-
 @import "app";
 @import "bootstrap-override";
 @import "common/base";
-
 @import "editor/modal";
 @import "editor/nav";
 @import "editor/question";
@@ -29,12 +27,12 @@
 @import "editor/question-information";
 @import "editor/profile-preview";
 @import "editor/help";
-
 @import "player/player-core-mixin";
 
-.wiggi-wiz-editable{
+.wiggi-wiz-editable {
   .player-core-mixin();
 }
+
 @import "player/player-container";
 @import "player/corespring-player";
 
@@ -57,9 +55,9 @@ body {
 
 @profile-summary-feedback-panel-bg: @darker-blue;
 
-.btn{
+.btn {
   &:focus, &:active:focus, &:active {
-    outline:none;
+    outline: none;
   }
 }
 
@@ -89,25 +87,25 @@ body {
 .bar {
   padding-left: 10px;
 }
-  
+
 .pane-header {
   text-transform: uppercase;
   font-size: 16px;
   font-weight: 600;
   color: #da1c5c;
   text-transform: uppercase;
   padding: 0.8em 0 0 0;
-  font-family: 'Whitney SSm A','Whitney SSm B', sans-serif;
+  font-family: 'Whitney SSm A', 'Whitney SSm B', sans-serif;
   -webkit-font-smoothing: antialiased;
   -font-smoothing: antialiased;
 }
 
 .pane-sub-header {
   font-size: 14px;
-} 
+}
 
 .vertical-divider {
-  border-left: 1px solid #eeeeee; 
+  border-left: 1px solid #eeeeee;
   width: 1px;
   font-size: 1px;
   margin-left: 15px;
@@ -117,9 +115,10 @@ body {
 }
 
 .config-pane {
-  width: 670px;
-  max-width: 670px;
-  min-width: 670px;
+  @config-pane-width: 550px;
+  width: @config-pane-width;
+  max-width: @config-pane-width;
+  min-width: @config-pane-width;
 }
 
 .preview-right {

modules/container-client/src/js/editing/controllers/_declaration.js

@@ -0,0 +1 @@
+angular.module('corespring-editing.controllers', [ ]);

modules/container-client/src/js/editor/controllers/client-side-preview.js → modules/container-client/src/js/editing/controllers/client-side-preview.js

@@ -1,18 +1,19 @@
-angular.module('corespring-editor.controllers')
+angular.module('corespring-editing.controllers')
     .controller('ClientSidePreview', [
     '$log',
     '$scope',
-    'ComponentData',
     'ClientSidePlayerService',
-    'STATIC_PATHS',
+    'ComponentData',
     'EDITOR_EVENTS',
+    'STATIC_PATHS',
     function ClientSidePreview(
       $log,
       $scope,
+      ClientSidePlayerServiceDef,
       ComponentData,
-      ClientSidePlayerServiceDef, 
-      STATIC_PATHS,
-      EDITOR_EVENTS) {
+      EDITOR_EVENTS,
+      STATIC_PATHS
+    ) {
 
     $scope.playerLabelImg = STATIC_PATHS.assets + '/item-player-label.png';
 
@@ -114,6 +115,3 @@ angular.module('corespring-editor.controllers')
 
 }]);
 
-angular.module('corespring-editor.controllers').constant('EDITOR_EVENTS', {
-    CONTENT_ADDED_TO_EDITOR: 'content.added.to.editor'
-});

modules/container-client/src/js/editing/controllers/editor-events.js

@@ -0,0 +1,3 @@
+angular.module('corespring-editing.controllers').constant('EDITOR_EVENTS', {
+  CONTENT_ADDED_TO_EDITOR: 'content.added.to.editor'
+});

modules/container-client/src/js/editing/directives/_declaration.js

@@ -0,0 +1 @@
+angular.module('corespring-editing.directives', [ ]);

modules/container-client/src/js/editor/question/directives/preview-player-control-panel.js → modules/container-client/src/js/editing/directives/preview-player-control-panel.js

@@ -1,5 +1,6 @@
-angular.module('corespring-editor.directives')
-  .directive('previewPlayerControlPanel', ['$log',
+angular.module('corespring-editing.directives')
+  .directive('previewPlayerControlPanel', [
+    '$log',
     function($log){
 
       function link($scope, $element, $attrs){
@@ -29,7 +30,7 @@ angular.module('corespring-editor.directives')
         mode: '=',
         score: '='
       },
-      templateUrl: '/editor/question/directives/preview-player-control-panel.html'
+      templateUrl: '/editing/directives/preview-player-control-panel.html'
     };
   }
 ]);

modules/container-client/src/js/editor/question/directives/preview-player.js → modules/container-client/src/js/editing/directives/preview-player.js

@@ -2,7 +2,7 @@
   /**
    * Non optimized preview player for the editor
    */
-  angular.module('corespring-editor.directives')
+  angular.module('corespring-editing.directives')
     .directive('previewPlayer', ['$log', 'ComponentRegister', 'ComponentData',
       function($log, ComponentRegister, ComponentData) {
 

modules/container-client/src/js/editing/services/_declaration.js

@@ -0,0 +1 @@
+angular.module('corespring-editing.services', [ ]);

modules/container-client/src/js/editor/services/component-data.js → modules/container-client/src/js/editing/services/component-data.js

@@ -1,4 +1,4 @@
-angular.module('corespring-editor.services')
+angular.module('corespring-editing.services')
   .service('ComponentData', [
     '$timeout',
     'LogFactory',

modules/container-client/src/js/editor/services/component-default-data.js → modules/container-client/src/js/editing/services/component-default-data.js

@@ -1,4 +1,4 @@
-angular.module('corespring-editor.services')
+angular.module('corespring-editing.services')
   .service('ComponentDefaultData', [
     'LogFactory',
     function(LogFactory) {

modules/container-client/src/js/editor/services/editor-dialog-template.js → modules/container-client/src/js/editing/services/editor-dialog-template.js

@@ -1,4 +1,4 @@
-angular.module('corespring-editor.services')
+angular.module('corespring-editing.services')
   .service('EditorDialogTemplate', [function() {
 
     function EditorDialogTemplate() {

modules/container-client/src/js/editing/wiggi-wiz-features/_declaration.js

@@ -0,0 +1,6 @@
+angular.module('corespring-editing.wiggi-wiz-features', [
+  'corespring-editing.wiggi-wiz-features.cs-image',
+  'corespring-editing.wiggi-wiz-features.footnotes',
+  'corespring-editing.wiggi-wiz-features.link',
+  'corespring-editing.wiggi-wiz-features.mathjax'
+  ]);

modules/container-client/src/js/editing/wiggi-wiz-features/csimage/_declaration.js

@@ -0,0 +1 @@
+angular.module('corespring-editing.wiggi-wiz-features.cs-image', []);

modules/container-client/src/js/editor/question/wiggi-wiz-features/csimage/feature.js → modules/container-client/src/js/editing/wiggi-wiz-features/csimage/feature.js

@@ -1,4 +1,4 @@
-angular.module('corespring.wiggi-wiz-features.cs-image').factory('ImageFeature', [
+angular.module('corespring-editing.wiggi-wiz-features.cs-image').factory('ImageFeature', [
   'Image',
   'TemplateUtils',
   function(ImageDef, TemplateUtils) {

modules/container-client/src/js/editor/question/wiggi-wiz-features/csimage/image-holder.js → modules/container-client/src/js/editing/wiggi-wiz-features/csimage/image-holder.js

@@ -1,4 +1,4 @@
-angular.module('corespring.wiggi-wiz-features.cs-image').directive('imageHolder', ['$log', 'ImageFeature',
+angular.module('corespring-editing.wiggi-wiz-features.cs-image').directive('imageHolder', ['$log', 'ImageFeature',
 
   function($log, ImageFeature) {
 

modules/container-client/src/js/editing/wiggi-wiz-features/footnotes/_declaration.js

@@ -0,0 +1 @@
+angular.module('corespring-editing.wiggi-wiz-features.footnotes', []);

modules/container-client/src/js/editor/question/wiggi-wiz-features/footnotes/feature.js → modules/container-client/src/js/editing/wiggi-wiz-features/footnotes/feature.js

@@ -1,4 +1,4 @@
-angular.module('corespring.wiggi-wiz-features.footnotes').factory('WiggiFootnotesFeatureDef', [
+angular.module('corespring-editing.wiggi-wiz-features.footnotes').factory('WiggiFootnotesFeatureDef', [
   'LogFactory',
   function(LogFactory) {
 

modules/container-client/src/js/editor/question/wiggi-wiz-features/footnotes/footnotes-dialog.js → modules/container-client/src/js/editing/wiggi-wiz-features/footnotes/footnotes-dialog.js

@@ -1,4 +1,4 @@
-angular.module('corespring.wiggi-wiz-features.footnotes').directive('footnotesDialog', [
+angular.module('corespring-editing.wiggi-wiz-features.footnotes').directive('footnotesDialog', [
   'LogFactory',
   function(LogFactory) {
 

modules/container-client/src/js/editor/question/wiggi-wiz-features/footnotes/footnotes-holder.js → modules/container-client/src/js/editing/wiggi-wiz-features/footnotes/footnotes-holder.js

@@ -1,4 +1,4 @@
-angular.module('corespring.wiggi-wiz-features.footnotes').directive('footnotesHolder', [
+angular.module('corespring-editing.wiggi-wiz-features.footnotes').directive('footnotesHolder', [
   'LogFactory',
   function(LogFactory) {
 

modules/container-client/src/js/editing/wiggi-wiz-features/link/_declaration.js

@@ -0,0 +1 @@
+angular.module('corespring-editing.wiggi-wiz-features.link', []);

modules/container-client/src/js/editor/question/wiggi-wiz-features/link/feature.js → modules/container-client/src/js/editing/wiggi-wiz-features/link/feature.js

@@ -1,4 +1,4 @@
-angular.module('corespring.wiggi-wiz-features.link').factory('WiggiLinkFeatureDef', [ '$compile', '$timeout',
+angular.module('corespring-editing.wiggi-wiz-features.link').factory('WiggiLinkFeatureDef', [ '$compile', '$timeout',
 
   function($compile, $timeout) {