Changeset 3794

Timestamp:

10/18/13 10:00:46 (11 years ago)

Author:

andmor

Message:

Style and syntax corrections.

Location:

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site

Files:

• partials/loginModal.html (modified) (1 diff)
• partials/workspace.html (modified) (3 diffs)
• scripts/controllers.js (modified) (6 diffs)
• scripts/services.js (modified) (1 diff)

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/partials/loginModal.html

@@ -3 +3 @@
     <div class="modal-header">
         <button type="button" class="close" data-ng-click="loginClose()">×</button>
-        <h3 name="loginModalLabel">Login to SCHEMAcat</h3>
+        <h3 id="loginModalLabel">Login to SCHEMAcat</h3>
     </div>
     <div class="modal-body">
-        <form name="loginForm">
+        <form id="loginForm">
             <div>
                 <label>User</label>
-                <input name="loginNameInput" type="text" required="" data-ng-model="loginNameInput.text"/>
+                <input name="loginNameInput" type="text" required="required" data-ng-model="loginNameInput.text"/>
                 <div class="control-group error" data-ng-show="loginForm.loginNameInput.$dirty &amp;&amp; loginForm.loginNameInput.$invalid">
                     <small class="help-block" data-ng-show="loginForm.loginNameInput.$error.required">

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/partials/workspace.html

@@ -59 +59 @@
                             <h5>Group tags:</h5>
                         </div>
-                        <h6 data-ng-show="selectedSchema['sc:schema']['sc:tag']['content']" data-ng-bind=" '[' + selectedSchema['sc:schema']['sc:tag']['content'] + ']'"/>
+                        <h6 data-ng-show="selectedSchema['sc:schema']['sc:tag']['content']" data-ng-bind=" '[' + selectedSchema['sc:schema']['sc:tag']['content'] + ']'"></h6>
                     </div>
                     <div>
@@ -66 +66 @@
                             <li data-ng-repeat="file in filesList" data-ng-controller="FileController">
                                 <span>
-                                    <span data-ng-bind="file['sc:name']"/><span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                                    <button type="button" class="btn btn-success btn-mini" data-ng-model="showSchemaBtn" btn-checkbox="" data-ng-click="showFile(selectedSchema['sc:schema']['xml:id'], file['sc:name']);">
+                                    <span data-ng-bind="file['sc:name']"></span><span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                                    <button type="button" class="btn btn-success btn-mini" data-ng-model="showSchemaBtn" data-btn-checkbox="" data-ng-click="showFile(selectedSchema['sc:schema']['xml:id'], file['sc:name']);">
                                         <span data-ng-hide="showSchemaBtn">Show</span><span data-ng-show="showSchemaBtn">Hide</span>
                                     </button>
@@ -74 +74 @@
                                 </span>
                                 <div data-collapse="!file.open">
-                                    <pre><code data-ng-class="prettify" data-ng-bind="schemaFileContent"/></pre>
+                                    <pre><code data-ng-class="prettify" data-ng-bind="schemaFileContent"></code></pre>
                                 </div>
                             </li>

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/scripts/controllers.js

@@ -23 +23 @@
             var watchListener = $scope.$watch('resultAsArrived', function (newValue, oldValue){
                 if(newValue) {
-                    if(Settings.animations) {
+                    if(Settings.getAnimationStatus()) {
                         //fade in the workspace page
                         switch (parentScope.toNextPage){
@@ -76 +76 @@
             $scope.$on("$routeChangeStart", function(event, next, current) {
                 parentScope.resultAsArrived = false; 
-                if(Settings.animations) {
+                if(Settings.getAnimationStatus()) {
                     parentScope.toNextPage = 
                         next.params.pageNumber > current.params.pageNumber ?
@@ -95 +95 @@
                 if(route.params.schemaIndex !== $scope.selectedSchemaIndex) {
                     parentScope.resultAsArrived = false;
-                    if(Settings.animations) {
+                    if(Settings.getAnimationStatus()) {
                         $scope.toNextSchema = 
                             route.params.schemaIndex > $scope.selectedSchemaIndex ? 
@@ -164 +164 @@
                         parentScope.filesList = prepareArrayForNgRepeat(result['sc:schema']['sc:files']['sc:file']);
                         
-                        if(Settings.animations) {
+                        if(Settings.getAnimationStatus()) {
                             //fade in the schema metadata
                             switch ($scope.toNextSchema){
@@ -281 +281 @@
 
             $scope.updateAnimationStatus = function(){
-                $scope.animationsChecked = !$scope.animationsChecked
+                $scope.animationsChecked = !$scope.animationsChecked;
                 if($scope.animationsChecked)
                     delete $location.search().animationsDisabled;
@@ -321 +321 @@
                 $scope.topMenuCollapsed = !$location.search().topMenuExpanded;
                 
-                Settings.setAnimations(!$location.search().animationsDisabled);
-                $scope.animationsChecked = Settings.animations;
+                Settings.setAnimationStatus(!$location.search().animationsDisabled);
+                $scope.animationsChecked = Settings.getAnimationStatus();
             };
         

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/scripts/services.js

@@ -15 +15 @@
 
 SCHEMAcat.factory('Settings', function(){
+    var animations = true;
+    
+    function _setAnimationStatus(value){
+            animations = value;
+    };
+    function _getAnimationStatus(){
+            return animations;  
+    };
     return {
-        setAnimations: function(value){
-            this.animations = value;
-            return this.animations;
-        }
-    };                 
+        getAnimationStatus: _getAnimationStatus,
+        setAnimationStatus: _setAnimationStatus
+    };
 });