Browse Source

updated project to Ember 1.10 stable

Rafał Pitoń 10 years ago
parent
commit
89828b0dc2

+ 3 - 0
misago/emberapp/Brocfile.js

@@ -6,6 +6,9 @@ var app = new EmberApp({
   fingerprint: {
     enabled: false
   },
+  vendorFiles: {
+    'handlebars.js': null
+  },
   outputPaths: {
     app: {
       html: 'index.html',

+ 1 - 1
misago/emberapp/app/app.js

@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
-import registerGettextHelpers from 'django-ember-gettext/helpers/gettext';
+import registerGettextHelpers from 'django-ember-gettext/lib/main';
 import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;

+ 2 - 3
misago/emberapp/bower.json

@@ -1,14 +1,13 @@
 {
   "name": "misago",
   "dependencies": {
-    "handlebars": "~2.0.0",
     "jquery": "^1.11.1",
-    "ember": "1.10.0-beta.4",
+    "ember": "1.10.0",
     "ember-data": "1.0.0-beta.14",
     "ember-resolver": "~0.1.11",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
+    "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
     "ember-qunit": "0.1.8",
     "ember-qunit-notifications": "0.0.5",

+ 7 - 5
misago/emberapp/package.json

@@ -20,18 +20,20 @@
   "license": "GNU GPL v2",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.0",
-    "django-ember-gettext": "0.9.7",
-    "ember-cli": "0.1.9",
-    "ember-cli-6to5": "0.2.1",
+    "django-ember-gettext": "^0.9.9",
+    "ember-cli": "0.1.12",
+    "ember-cli-6to5": "^3.0.0",
+    "ember-cli-app-version": "0.3.1",
     "ember-cli-content-security-policy": "0.3.0",
     "ember-cli-dependency-checker": "0.0.7",
     "ember-cli-htmlbars": "^0.6.0",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-less": "1.1.0",
-    "ember-cli-qunit": "0.1.2",
+    "ember-cli-qunit": "0.3.1",
+    "ember-cli-uglify": "1.0.1",
     "ember-data": "1.0.0-beta.14",
-    "ember-django-adapter": "0.5.2",
+    "ember-django-adapter": "0.5.3",
     "ember-export-application-global": "^1.0.0",
     "express": "^4.8.5",
     "glob": "^4.0.5"

+ 0 - 16
misago/emberapp/tests/index.html

@@ -13,22 +13,6 @@
     <link rel="stylesheet" href="misago/css/vendor.css">
     <link rel="stylesheet" href="misago/css/misago.css">
     <link rel="stylesheet" href="assets/test-support.css">
-    <style>
-      #ember-testing-container {
-        position: absolute;
-        background: white;
-        bottom: 0;
-        right: 0;
-        width: 640px;
-        height: 384px;
-        overflow: auto;
-        z-index: 9999;
-        border: 1px solid #ccc;
-      }
-      #ember-testing {
-        zoom: 50%;
-      }
-    </style>
 
     {{content-for 'head-footer'}}
     {{content-for 'test-head-footer'}}

+ 0 - 6
misago/emberapp/tests/test-helper.js

@@ -4,9 +4,3 @@ import {
 } from 'ember-qunit';
 
 setResolver(resolver);
-
-document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
-
-QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
-var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible';
-document.getElementById('ember-testing-container').style.visibility = containerVisibility;