new release (1.0.2) build

IPS-LMU · Jun 25, 2019 · a27b634 · a27b634
1 parent 0aae593
commit a27b634
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 17 deletions.
diff --git a/app/NEWS.md b/app/NEWS.md
@@ -1,5 +1,11 @@
 # What's New
 
+## Version 1.0.2
+
+### bug fixes
+
+- revert of "resize now listens to $window.parent not $window" as it causes RStudio not to load the page
+
 ## Version 1.0.1
 
 1.0.0 version bump because it has been in regular stable use for 

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "EMU-webApp",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "manifest_version": 2,
     "minimum_chrome_version": "23",
     "description": "The EMU-webApp is an online and offline Web-App for labeling, visualizing and correcting speech and derived speech data.",

diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
@@ -40,9 +40,9 @@ angular.module('emuwebApp')
 		// bindings
 
 		// bind window resize event
-		angular.element($window.parent).bind('resize', function () {
+		angular.element($window).bind('resize', function () {
 			LevelService.deleteEditArea();
-			viewState.setWindowWidth($window.parent.outerWidth);
+			viewState.setWindowWidth($window.outerWidth);
 			if (viewState.hierarchyState.isShown()) {
 				++viewState.hierarchyState.resize;
 			}

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "emuwebapp",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "dependencies": {
     "jquery": "^3.1.1",
     "angular": "^1.5.8",

diff --git a/dist/NEWS.md b/dist/NEWS.md
@@ -1,5 +1,11 @@
 # What's New
 
+## Version 1.0.2
+
+### bug fixes
+
+- revert of "resize now listens to $window.parent not $window" as it causes RStudio not to load the page
+
 ## Version 1.0.1
 
 1.0.0 version bump because it has been in regular stable use for 

diff --git a/dist/index.html b/dist/index.html
@@ -14,4 +14,4 @@
             _paq.push(['setSiteId', '31']);
             var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
             g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-        })(); </script> <!-- End Matomo - Code --> <script src="scripts/vendor.16046c50.js"></script> <script src="scripts/scripts.9e58ef09.js"></script> </body> </html> 
+        })(); </script> <!-- End Matomo - Code --> <script src="scripts/vendor.16046c50.js"></script> <script src="scripts/scripts.5e32fabf.js"></script> </body> </html> 
diff --git a/dist/manifest.appcache b/dist/manifest.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# rev 1 - 2019-06-24T16:39:34.124Z
+# rev 1 - 2019-06-25T15:23:12.577Z
 
 CACHE:
 404.html
@@ -86,7 +86,7 @@ schemaFiles/DBconfigFileSchema.json
 schemaFiles/designSchema.json
 schemaFiles/emuwebappConfigSchema.json
 schemaFiles/globalDBschema.json
-scripts/scripts.9e58ef09.js
+scripts/scripts.5e32fabf.js
 scripts/vendor.16046c50.js
 scripts/workers/espsParserWorkerClass.131a7761.js
 scripts/workers/serviceWorker.d41d8cd9.js

diff --git a/dist/manifest.json b/dist/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "EMU-webApp",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "manifest_version": 2,
     "minimum_chrome_version": "23",
     "description": "The EMU-webApp is an online and offline Web-App for labeling, visualizing and correcting speech and derived speech data.",

diff --git a/dist/manual/Introduction.md b/dist/manual/Introduction.md
@@ -7,9 +7,9 @@ author: Raphael Winkelmann
 ![icon](assets/EMU-webAppIcon-roundCorners.svg)
 
 
-- **Version: 1.0.1**
-- *Build time stamp: Mon Jun 24 2019 18:39:33*
-- *Build GIT SHA-1: a154523c0461b69372cb82c7c2f0afd0f7f9b62c - master*
+- **Version: 1.0.2**
+- *Build time stamp: Tue Jun 25 2019 17:23:11*
+- *Build GIT SHA-1: 0aae593a36a3679129f68fcc1ac49fa3b89dbdb5 - master*
 - *EMU-webApp-websocket-protocol version: 0.0.2*
 
 --------------------- 

diff --git a/dist/scripts/scripts.9e58ef09.js → dist/scripts/scripts.5e32fabf.js b/dist/scripts/scripts.9e58ef09.js → dist/scripts/scripts.5e32fabf.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emuwebapp",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The EMU-webApp is an online and offline Web-App for labeling, visualizing and correcting speech and derived speech data.",
   "main": "app/scripts/app.js",
   "author": "Raphael Winkelmann, Georg Raess",

diff --git a/test/spec/controllers/main.spec.js b/test/spec/controllers/main.spec.js
@@ -624,7 +624,7 @@ describe('Controller: MainController', function () {
    it('should react on resize window', function () {
      spyOn(scope.lvl, 'deleteEditArea');
      spyOn(scope.vs, 'setWindowWidth');
-     angular.element($window.parent).triggerHandler('resize');
+     angular.element($window).triggerHandler('resize');
      scope.$digest();
      expect(scope.lvl.deleteEditArea).toHaveBeenCalled();
      expect(scope.vs.setWindowWidth).toHaveBeenCalled();