Revert "Fix html2js"
This commit is contained in:
parent
e269fd8756
commit
79de5038ac
|
@ -227,7 +227,7 @@ module.exports = function(grunt) {
|
||||||
},
|
},
|
||||||
html2js: {
|
html2js: {
|
||||||
options: {
|
options: {
|
||||||
base: 'public',
|
base: 'NodeForm',
|
||||||
watch: true,
|
watch: true,
|
||||||
module: 'NodeForm.templates',
|
module: 'NodeForm.templates',
|
||||||
singleModule: true,
|
singleModule: true,
|
||||||
|
@ -294,7 +294,7 @@ module.exports = function(grunt) {
|
||||||
grunt.registerTask('lint:tests', ['jshint:allTests']);
|
grunt.registerTask('lint:tests', ['jshint:allTests']);
|
||||||
|
|
||||||
// Build task(s).
|
// Build task(s).
|
||||||
grunt.registerTask('build', ['lint', 'loadConfig', 'cssmin', 'html2js:main', 'ngAnnotate', 'uglify']);
|
grunt.registerTask('build', ['lint', 'loadConfig', 'cssmin', 'ngAnnotate', 'uglify', 'html2js:main']);
|
||||||
|
|
||||||
// Test task(s).
|
// Test task(s).
|
||||||
grunt.registerTask('test', ['lint:tests', 'test:server', 'test:client']);
|
grunt.registerTask('test', ['lint:tests', 'test:server', 'test:client']);
|
||||||
|
|
2713
public/dist/application.js
vendored
Normal file
2713
public/dist/application.js
vendored
Normal file
File diff suppressed because one or more lines are too long
4
public/dist/application.min.css
vendored
Normal file
4
public/dist/application.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
4
public/dist/application.min.js
vendored
Normal file
4
public/dist/application.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -1,8 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Setting up route
|
// Setting up route
|
||||||
angular.module('forms').config([
|
angular.module('forms').config(['$stateProvider',
|
||||||
'$stateProvider',
|
|
||||||
|
|
||||||
function($stateProvider) {
|
function($stateProvider) {
|
||||||
// Forms state routing
|
// Forms state routing
|
||||||
|
@ -46,7 +45,7 @@ angular.module('forms').config([
|
||||||
templateUrl: 'modules/forms/views/adminTabs/design.html'
|
templateUrl: 'modules/forms/views/adminTabs/design.html'
|
||||||
}).state('viewForm.analyze', {
|
}).state('viewForm.analyze', {
|
||||||
url: '/analyze',
|
url: '/analyze',
|
||||||
templateUrl: 'modules/forms/views/adminTabs/analyze.html'
|
templateUrl: 'modules/forms/views/adminTabs/analyze.html',
|
||||||
}).state('viewForm.create', {
|
}).state('viewForm.create', {
|
||||||
url: '/create',
|
url: '/create',
|
||||||
templateUrl: 'modules/forms/views/adminTabs/create.html'
|
templateUrl: 'modules/forms/views/adminTabs/create.html'
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Forms controller
|
// Forms controller
|
||||||
angular.module('forms').controller('AdminFormController', [
|
angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope', '$stateParams', '$state', 'Forms', 'CurrentForm', '$http', '$uibModal', 'myForm',
|
||||||
'$rootScope', '$scope', '$stateParams', '$state', 'Forms',
|
function($rootScope, $scope, $stateParams, $state, Forms, CurrentForm, $http, $uibModal, myForm) {
|
||||||
'CurrentForm', '$http', '$uibModal', 'myForm',
|
|
||||||
|
|
||||||
function($rootScope, $scope, $stateParams, $state, Forms,
|
|
||||||
CurrentForm, $http, $uibModal, myForm) {
|
|
||||||
|
|
||||||
$scope = $rootScope;
|
$scope = $rootScope;
|
||||||
$scope.animationsEnabled = true;
|
$scope.animationsEnabled = true;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('forms').directive('configureFormDirective', [
|
angular.module('forms').directive('configureFormDirective', ['$rootScope', '$http', 'Upload', 'CurrentForm',
|
||||||
'$rootScope', '$http', 'Upload', 'CurrentForm',
|
|
||||||
function ($rootScope, $http, Upload, CurrentForm) {
|
function ($rootScope, $http, Upload, CurrentForm) {
|
||||||
return {
|
return {
|
||||||
templateUrl: 'modules/forms/views/directiveViews/form/configure-form.client.view.html',
|
templateUrl: 'modules/forms/views/directiveViews/form/configure-form.client.view.html',
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('forms').directive('editFormDirective', [
|
angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormFields',
|
||||||
'$rootScope', 'FormFields',
|
|
||||||
function ($rootScope, FormFields) {
|
function ($rootScope, FormFields) {
|
||||||
return {
|
return {
|
||||||
templateUrl: 'modules/forms/views/directiveViews/form/edit-form.client.view.html',
|
templateUrl: 'modules/forms/views/directiveViews/form/edit-form.client.view.html',
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('forms').directive('editSubmissionsFormDirective', [
|
angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', '$http',
|
||||||
'$rootScope', '$http',
|
|
||||||
function ($rootScope, $http) {
|
function ($rootScope, $http) {
|
||||||
return {
|
return {
|
||||||
templateUrl: 'modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html',
|
templateUrl: 'modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html',
|
||||||
|
|
|
@ -33,7 +33,7 @@ angular.module('forms').directive('fieldDirective', ['$http', '$compile', '$root
|
||||||
templateUrl = templateUrl+type+'.html';
|
templateUrl = templateUrl+type+'.html';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $templateCache.get(templateUrl);
|
return $templateCache.get('../public/'+templateUrl);
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Setting up route
|
// Setting up route
|
||||||
angular.module('users').config([
|
angular.module('users').config(['$stateProvider',
|
||||||
'$stateProvider',
|
|
||||||
function($stateProvider) {
|
function($stateProvider) {
|
||||||
|
|
||||||
var checkLoggedin = function($q, $timeout, $state, User, Auth) {
|
var checkLoggedin = function($q, $timeout, $state, User, Auth) {
|
||||||
|
|
323
public/populate_template_cache.js
Normal file
323
public/populate_template_cache.js
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue