Merge pull request #16 from ThatGerber/chris-dev

Repo Cleanup

Author: chriswgerber

.jshintrc

@@ -3,7 +3,6 @@
   "passfail"      : false,  // Stop on first error.
   "maxerr"        : 100,    // Maximum error before stopping.
 
-
   // Predefined globals whom JSHint will ignore.
   "browser"       : true,   // Standard browser globals e.g. `window`, `document`.
 
@@ -13,15 +12,11 @@
   "wsh"           : true,   // Windows Scripting Host.
 
   "jquery"        : true,
-  "ender"         : true,
-  "prototypejs"   : false,
-  "mootools"      : false,
-  "dojo"          : false,
 
-  "predef"        : [  // Custom globals.
-    //"exampleVar",
-    //"anotherCoolGlobal",
-    //"iLoveDouglas"
+  // Custom globals.
+  "predef"        : [
+    "googletag",
+    "dfp_ad_object"
   ],
 
 

assets/js/dfp-ads.js

@@ -20,16 +20,6 @@ googletag.cmd.push(function() {
             define_ad_slot(positions[ad_pos]);
         }
     }
-    // Generates Ad Slots
-    load_ad_positions(dfp_ad_data.positions);
-    // Collapse Empty Divs
-    googletag.pubads().collapseEmptyDivs(true);
-    // Targeting
-    set_targeting(dfp_ad_data.page_targeting);
-    // Asynchronous Loading
-    googletag.pubads().enableAsyncRendering();
-    // Go
-    googletag.enableServices();
     /**
      * Loads Ad Position
      *
@@ -58,4 +48,14 @@ googletag.cmd.push(function() {
             googletag.pubads().setTargeting(key, targeting[target]);
         }
     }
+    // Generates Ad Slots
+    load_ad_positions(dfp_ad_data.positions);
+    // Collapse Empty Divs
+    googletag.pubads().collapseEmptyDivs(true);
+    // Targeting
+    set_targeting(dfp_ad_data.page_targeting);
+    // Asynchronous Loading
+    googletag.pubads().enableAsyncRendering();
+    // Go
+    googletag.enableServices();
 });

assets/js/google-ads.js

@@ -7,7 +7,7 @@ googletag.cmd = googletag.cmd || [];
     var gads = document.createElement('script');
     gads.async = true;
     gads.type = 'text/javascript';
-    var useSSL = 'https:' == document.location.protocol;
+    var useSSL = 'https:' === document.location.protocol;
     gads.src = (useSSL ? 'https:' : 'http:') +
     '//www.googletagservices.com/tag/js/gpt.js';
     var node = document.getElementsByTagName('script')[0];

assets/js/google-ads.min.js

@@ -1,6 +1,6 @@
 index.php
 plugin.php
 readme.txt
-js/
-src/
+assets/
+includes/
 widget/

build/wordpress-files.txt

@@ -13,7 +13,7 @@ cd $BUILD/../;
 ###
 # Move vendor files to lib folder
 ###
-rsync -vah --exclude ".*/" vendor/ "$REPO_DIR/lib"
+rsync -vah --exclude ".*/" vendor/ "$REPO_DIR/vendor"
 
 ###
 # Make directory of files to import
@@ -26,12 +26,6 @@ rsync -hav --exclude ".*/" --files-from=build/wordpress-files.txt . "$REPO_DIR/"
 echo "Updating version to $VERSION";
 sed -i '' "s|\* Version:           *.*.*|\* Version:           $VERSION|" "$REPO_DIR/plugin.php"
 
-###
-# Change autoload
-###
-echo "Changing location of autoload";
-sed -i '' "s|require_once 'vendor/autoload.php'|require_once 'lib/autoload.php'|" "$REPO_DIR/plugin.php"
-
 ###
 # Updating Repo
 ###

build/wordpress_build.sh

@@ -5,24 +5,11 @@
 
 var gulp = require( 'gulp' ),
     plumber = require( 'gulp-plumber' ),
-    watch = require( 'gulp-watch' ),
-    livereload = require( 'gulp-livereload' ),
-    minifycss = require( 'gulp-minify-css' ),
     concat = require('gulp-concat'),
     jshint = require( 'gulp-jshint' ),
-    notify = require( 'gulp-notify' ),
-    include = require( 'gulp-include' ),
-    autoprefixer = require('gulp-autoprefixer'),
-    imagemin = require('gulp-imagemin'),
     stylish = require( 'jshint-stylish' ),
     uglify = require( 'gulp-uglify' ),
-    rename = require( 'gulp-rename' ),
-    sass = require( 'gulp-sass' );
-
-var onError = function( err ) {
-    console.log( 'An error occurred:', err.message );
-    this.emit( 'end' );
-};
+    rename = require( 'gulp-rename' );
 
 // Lint Task
 gulp.task('lint', function() {

gulpfile.js

@@ -1,3 +1,2 @@
 <?php
-
 // Silence is Golden...

src/abstract.dfp_ads_form.php renamed to includes/abstract.dfp_ads_form.php

@@ -7,23 +7,15 @@
     "test": "tests"
   },
   "dependencies": {
-    "gulp-autoprefixer": "^2.3.1",
     "del": "^1.2.0",
     "gulp": "^3.9.0",
     "gulp-cache": "^0.2.10",
-    "gulp-imagemin": "^2.3.0",
     "gulp-concat": "^2.6.0",
     "gulp-jshint": "^1.11.1",
     "gulp-include": "^1.1.1",
-    "gulp-livereload": "^3.8.0",
-    "gulp-minify-css": "^1.2.0",
-    "gulp-notify": "^2.2.0",
     "gulp-plumber": "^1.0.1",
-    "gulp-sass": "^2.0.3",
     "gulp-rename": "^1.2.2",
-    "gulp-ruby-sass": "^1.0.5",
     "gulp-uglify": "^1.2.0",
-    "gulp-watch": "^4.2.4",
     "jshint-stylish": "^2.0.1"
   },
   "devDependencies": {},

src/class.dfp_ad_position.php renamed to includes/class.dfp_ad_position.php

@@ -27,15 +27,15 @@
 require_once 'vendor/autoload.php';
 
 /* Library */
-include( 'src/helper_functions.php' );
-include( 'src/abstract.dfp_ads_form.php' );
-include( 'src/class.dfp_ads.php' );
-include( 'src/class.dfp_ads_post_type.php' );
-include( 'src/class.dfp_ads_input.php' );
-include( 'src/class.dfp_ad_position.php' );
-include( 'src/class.dfp_ads_settings_form.php' );
-include( 'src/class.dfp_ads_import_form.php' );
-include( 'src/class.dfp_ads_admin.php' );
+include( 'includes/helper_functions.php' );
+include( 'includes/abstract.dfp_ads_form.php' );
+include( 'includes/class.dfp_ads.php' );
+include( 'includes/class.dfp_ads_post_type.php' );
+include( 'includes/class.dfp_ads_input.php' );
+include( 'includes/class.dfp_ad_position.php' );
+include( 'includes/class.dfp_ads_settings_form.php' );
+include( 'includes/class.dfp_ads_import_form.php' );
+include( 'includes/class.dfp_ads_admin.php' );
 include( 'widget/widget.ad_position.php' );
 
 /*