diff --git a/package.json b/package.json index a69bbb2..e578145 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ }, "version": "2.0.5", "dependencies": { - "materia-widget-development-kit": "2.5.2" + "materia-widget-development-kit": "../../MWDK4" }, "devDependencies": { "angular-mocks": "~1.5.0", @@ -13,9 +13,9 @@ "jest-coffee-preprocessor": "^1.0.0" }, "scripts": { - "start": "webpack-dev-server", - "build": "webpack -p", - "build-dev": "webpack", + "start": "mwdk-start", + "build": "mwdk-build-prod", + "build-dev": "mwdk-build-dev", "test": "TZ='America/New_York' jest --verbose", "test-ci": "TZ='America/New_York' CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura" }, diff --git a/src/controllers/creator.coffee b/src/controllers/creator.coffee index b5dd160..2a37dcc 100644 --- a/src/controllers/creator.coffee +++ b/src/controllers/creator.coffee @@ -1,6 +1,5 @@ -Matching = angular.module 'matching', ['ngAnimate'] - -Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) -> +angular.module 'matching', ['ngAnimate'] +.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) -> _qset = {} materiaCallbacks = {} # Stores data to be gathered on save. @@ -176,3 +175,5 @@ Matching.controller 'matchingCreatorCtrl', ['$scope', '$sce', ($scope, $sce) -> Materia.CreatorCore.start materiaCallbacks ] + +angular.bootstrap(document, ['matching']) \ No newline at end of file diff --git a/src/controllers/player.coffee b/src/controllers/player.coffee index aededdc..408482e 100644 --- a/src/controllers/player.coffee +++ b/src/controllers/player.coffee @@ -1,6 +1,5 @@ -Matching = angular.module 'matching' - -Matching.controller 'matchingPlayerCtrl', ['$scope', '$timeout', '$sce', ($scope, $timeout, $sce) -> +angular.module 'matching' +.controller 'matchingPlayerCtrl', ['$scope', '$timeout', '$sce', ($scope, $timeout, $sce) -> materiaCallbacks = {} $scope.title = '' @@ -513,3 +512,5 @@ Matching.controller 'matchingPlayerCtrl', ['$scope', '$timeout', '$sce', ($scope Materia.Engine.start materiaCallbacks ] + +angular.bootstrap(document, ['matching']) \ No newline at end of file diff --git a/src/creator.html b/src/creator.html index 257c9ec..7dc36a4 100644 --- a/src/creator.html +++ b/src/creator.html @@ -14,11 +14,8 @@ - - - - + + + + diff --git a/src/player.html b/src/player.html index 5aca273..517adce 100644 --- a/src/player.html +++ b/src/player.html @@ -16,10 +16,8 @@ - - - +