Explorar el Código

Removed localStorage support for now

Nicolas Petton hace 12 años
padre
commit
5a17d750b6
Se han modificado 4 ficheros con 3 adiciones y 113 borrados
  1. 0 13
      js/IDE.deploy.js
  2. 0 18
      js/IDE.js
  3. 2 61
      js/amber.js
  4. 1 21
      st/IDE.st

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 13
js/IDE.deploy.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 18
js/IDE.js


+ 2 - 61
js/amber.js

@@ -17,8 +17,6 @@ amber = (function() {
 	var debug;
 	var deploy;
 
-	var localStorageSource = [];
-	var localPackages;
 	var spec;
 
 	that.toggleIDE = function() {
@@ -59,7 +57,6 @@ amber = (function() {
 		loadJS('compat.js');
 		loadJS('boot.js');
 
-		populateLocalPackages();
 
 		if (deploy) {
 			loadPackages([
@@ -100,14 +97,6 @@ amber = (function() {
 			loadPackages(additionalFiles, spec.prefix);
 		}
 
-		// Always load all local packages
-		for (name in localPackages) {
-			log('Local package:  ' + name);
-			var sourceCode = unescape(localPackages[name]);
-			sourceCode += "\nsmalltalk.Package._init_('"+name+"')";
-			localStorageSource.push(sourceCode);
-		}
-
 		// Be sure to setup & initialize smalltalk classes
 		loadJS('init.js');
 		initializeSmalltalk();
@@ -119,13 +108,7 @@ amber = (function() {
 
 		for (var i=0; i < names.length; i++) {
 			name = names[i].split(/\.js$/)[0];
-
-			// Only load package from the server if it isn't stored in
-			// localStorage
-			if (!(name in localPackages)) {
-				log('Server package: ' + name);
-				loadJS(name + '.js', prefix);
-			}
+			loadJS(name + '.js', prefix);
 		}
 	};
 
@@ -142,8 +125,6 @@ amber = (function() {
 		loadJS('compat.js');
 		loadJS('boot.js');
 
-		populateLocalPackages();
-
 		if (deploy) {
 			loadPackages([
 				'Kernel-Objects.deploy',
@@ -183,12 +164,6 @@ amber = (function() {
 			loadPackages(additionalFiles, spec.prefix);
 		}
 
-		// Always load all local packages
-		for (name in localPackages) {
-			log('Local package:  ' + name);
-			localStorageSource.push(localPackages[name]);
-		}
-
 		// Be sure to setup & initialize smalltalk classes
 		loadJS('init.js');
 		initializeSmalltalk();
@@ -200,13 +175,7 @@ amber = (function() {
 
 		for (var i=0; i < names.length; i++) {
 			name = names[i].split(/\.js$/)[0];
-
-			// Only load package from the server if it isn't stored in
-			// localStorage
-			if (!(name in localPackages)) {
-				log('Server package: ' + name);
-				loadJS(name + '.js', prefix);
-			}
+			loadJS(name + '.js', prefix);
 		}
 	};
 
@@ -263,10 +232,6 @@ amber = (function() {
 
 		window.smalltalkReady = function() {
 
-			for (var i=0; i < localStorageSource.length; i++) {
-				eval(localStorageSource[i]);
-			}
-
 			if (deploy) {
 				smalltalk.setDeploymentMode();
 			}
@@ -277,30 +242,6 @@ amber = (function() {
 		}
 	};
 
-	function populateLocalPackages(){
-		var localStorageRE = /^smalltalk\.packages\.(.*)$/;
-		localPackages = {};
-
-		var match, key;
-
-		for(var i=0; i < localStorage.length; i++) {
-			key = localStorage.key(i);
-
-			if (match = key.match(localStorageRE)) {
-				localPackages[match[1]] = localStorage[key];
-			}
-		}
-
-		return localPackages;
-	};
-
-	function clearLocalPackages() {
-		for (var name in localPackages) {
-			log('Removing ' + name + ' from local storage');
-			localStorage.removeItem('smalltalk.packages.' + name);
-		}
-	};
-
 	function log(string) {
 		if (debug) {
 			console.log(string);

+ 1 - 21
st/IDE.st

@@ -732,14 +732,6 @@ removePackage
 	    self updateCategoriesList]
 !
 
-commitPackageToLocalStorage
-	| key sourceCode |
-	selectedPackage ifNotNil: [
-          	key := 'smalltalk.packages.' , selectedPackage.
-		sourceCode := (Exporter new exportPackage: selectedPackage).
-		<localStorage[key] = sourceCode>]
-!
-
 addNewClass
 	| className |
 	className := window prompt: 'New class'.
@@ -799,10 +791,6 @@ renderTopPanelOn: html
 					title: 'Commit classes in this package to disk';
 					onClick: [self commitPackage];
 					with: 'Commit'.
-        			html button 
-					title: 'Commit classes in this package to local storage';
-					onClick: [self commitPackageToLocalStorage];
-					with: 'Local'.
         			html button
 					title: 'Rename package';
 					onClick: [self renamePackage];
@@ -884,15 +872,7 @@ updateCategoriesList
 
 updateClassesList
     TabManager current update.
-    classesList updateNodes.
-    "classesList contents: [:html |
-	self classes do: [:each || li |
-	    li := html li.
-	    selectedClass = each ifTrue: [
-		li class: 'selected'].
-	    li
-		with: each name;
-		onClick: [self selectClass: each]]]"
+    classesList updateNodes
 !
 
 updateProtocolsList

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio