Added in support for interpreters to import different types of palett…

…e definitions. Removed previous colourlovers references.

index.html

@@ -50,7 +50,6 @@
 
 	<!-- Material Color Generator Application & Factories-->
 	<script src="scripts/app.js"></script>
-	<script src="scripts/factories/colourLovers.js"></script>
 
 	<!-- Load interpreter services -->
 	<script src="scripts/services/interpreters/angularJsInterpreter.js"></script>

scripts/app.js

@@ -25,8 +25,7 @@ mcgApp.config(function ($routeProvider, $mdThemingProvider, $sceDelegateProvider
         });
 
         $sceDelegateProvider.resourceUrlWhitelist([
-            'self',
-            'http://www.colourlovers.com/api/**'
+            'self'
         ]);
 
         // Watch for theme updates to dynamically change the theme.

scripts/controllers/ColorGeneratorCtrl.js

@@ -2,7 +2,7 @@
 
 // Define our default color generator controller!
 mcgApp.controller('ColorGeneratorCtrl',
-function ($scope, $mdDialog, ColourLovers, $rootScope, $mdColorPalette, $mdSidenav, $cookies, $location )
+function ($scope, $mdDialog, $rootScope, $mdColorPalette, $mdSidenav, $cookies, $location, TopInterpreter )
 {
 	// Init function.
 	// This is placed into a function
@@ -43,7 +43,6 @@ function ($scope, $mdDialog, ColourLovers, $rootScope, $mdColorPalette, $mdSiden
 
 		// Define palettes
 		$scope.palettes = [];
-		$scope.colourlovers = [];
 
 		// Toolbar is hidden by default.
 		$scope.initSpeedDial();
@@ -417,16 +416,45 @@ function ($scope, $mdDialog, ColourLovers, $rootScope, $mdColorPalette, $mdSiden
 			{
 				// ...add the palette!
 				if(typeof code === "string"){
-					$scope.palettes = JSON.parse(code);
-				}else if(typeof code === "object"){
-					$scope.addPaletteFromObject(code);
+					var palettesObject = $scope.parseImportString(code);
+					if(palettesObject === false){
+						alert('Error importing your provided code. Code should be originally exported from this tool and unmodified.');
+						return;
+					}
+					$scope.palettes = palettesObject;
 				}
 			}, function () { } );
 
 		// Google Analytics Event Track
 		ga( 'send', 'event', 'mcg', 'import_code' );
     };
 
+	/**
+	 * Takes input code and attempts to determine the appropriate interpreter and generate the palettes object.
+	 * @param code string
+	 * @returns {boolean|*}
+	 */
+	$scope.parseImportString = function(code)
+	{
+    	var interpreters = TopInterpreter.getInterpreters();
+		for (var name in interpreters) {
+			if (interpreters.hasOwnProperty(name)) {
+				var interpreter = interpreters[name];
+				if(
+					typeof interpreter.isApplicable === "function" &&
+					typeof interpreter.import === "function" &&
+					interpreter.isApplicable(code) === true
+				) {
+					var returnObj = interpreter.import(code);
+					if(returnObj){
+						return returnObj;
+					}
+				}
+			}
+		}
+		return false;
+	};
+
 	// Function to show export json for loading carts later
 	$scope.showDemo = function ()
 	{
@@ -494,53 +522,6 @@ function ($scope, $mdDialog, ColourLovers, $rootScope, $mdColorPalette, $mdSiden
 		ga('send', 'event', 'mcg', 'copy_code');
 	};
 
-	// Function to show generic clipboard alert dialog
-	$scope.showColourLovers = function ()
-	{
-		$mdDialog.show( {
-			templateUrl: 'templates/dialogs/colourlovers.html',
-			controller: ColourLoversDialogController
-		} );
-
-		// Google Analytics Event Track
-		ga( 'send', 'event', 'mcg', 'view_colourlovers' );
-
-		function ColourLoversDialogController( $scope, $mdDialog, ColourLovers )
-		{
-			$scope.init = function(){
-				$scope.colourlovers = [];
-				$scope.setColors = $rootScope.setPalettesByColors;
-				$scope.getTop();
-			};
-
-			// Get top colourlover palettes.
-			$scope.getTop = function(){
-				ColourLovers.getTop();
-			};
-
-			// Get new colourlover palettes.
-			$scope.getNew = function () {
-				ColourLovers.getNew();
-			};
-
-			// Get random colourlover palettes.
-			$scope.getRandom = function () {
-				ColourLovers.getRandom();
-			};
-
-			// Function to close dialog
-			$scope.closeDialog = function () {
-				$mdDialog.hide();
-			};
-
-			var CLGetSuccess = function (data) {
-				$scope.colourlovers = data;
-			};
-
-			$scope.init();
-		}
-	};
-
 	$scope.makeSafe = function(s){
 		return s.replace(/[^a-z0-9]/gi, '').toLowerCase();
 	};

templates/color_generator.html

@@ -29,12 +29,6 @@
                 <ng-md-icon icon="file_upload" size="34" style="fill:#ffffff;"></ng-md-icon>
             </md-button>
         </div>
-        <!--<div class="md-accent bright-text">-->
-            <!--<md-button class="md-accent" ng-click="showColourLovers()" style="margin-right: 15px;" aria-label="Select A ColourLovers Theme">-->
-                <!--<md-tooltip>Select A ColourLovers Theme</md-tooltip>-->
-                <!--<ng-md-icon icon="palette" size="34" style="fill:#fff;"></ng-md-icon>-->
-            <!--</md-button>-->
-        <!--</div>-->
         <div class="md-accent bright-text">
             <md-button class="md-accent" ng-click="addBasePalette()" style="margin-right: 15px;" aria-label="Add Palette">
                 <md-tooltip>Add Palette</md-tooltip>
@@ -114,10 +108,6 @@
                 <md-tooltip>Add Palette</md-tooltip>
                 <ng-md-icon icon="add_box" size="34" style="fill:#fff;"></ng-md-icon>
             </md-button>
-            <!--<md-button class="md-accent" md-visible="dialTooltipOpen" ng-click="showColourLovers()" style="margin-right: 15px;" aria-label="Select A ColourLovers Theme">-->
-                <!--<md-tooltip>Select A ColourLovers Theme</md-tooltip>-->
-                <!--<ng-md-icon icon="palette" size="34" style="fill:#fff;"></ng-md-icon>-->
-            <!--</md-button>-->
             <md-button class="md-accent" md-visible="dialTooltipOpen" ng-click="showImport()" style="margin-right: 15px;" aria-label="Import Theme">
                 <md-tooltip>Import</md-tooltip>
                 <ng-md-icon icon="file_upload" size="34" style="fill:#fff;"></ng-md-icon>