Fix id checking, ignoring id types

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "duoshuo-ua",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "authors": [
     "Gerald <gera2ld@163.com>"
   ],

gulpfile.js

@@ -2,7 +2,7 @@ var gulp = require('gulp');
 var wrap = require('gulp-wrap');
 var rename = require('gulp-rename');
 var concat = require('gulp-concat');
-var merge = require('gulp-merge');
+var merge2 = require('merge2');
 var uglify = require('gulp-uglify');
 var minifycss = require('gulp-minify-css');
 var css2js = require('gulp-css2js');
@@ -66,7 +66,7 @@ gulp.task('build-css', function () {
 });
 
 gulp.task('build-with-ua-parser-css', ['build-with-ua-parser', 'build-css'], function () {
-	return merge(embed_js, embed_css.pipe(css2js()))
+	return merge2(embed_js, embed_css.pipe(css2js()))
 		.pipe(concat('duoshuo-ua-parser-css.js'))
 		.pipe(uglify())
 		.pipe(header(banner, {
@@ -78,4 +78,6 @@ gulp.task('build-with-ua-parser-css', ['build-with-ua-parser', 'build-css'], fun
 		.pipe(gulp.dest('./dist'));
 });
 
-gulp.task('default', ['build-core', 'build-with-ua-parser-css']);
+gulp.task('build', ['build-core', 'build-with-ua-parser-css']);
+
+gulp.task('default', ['build']);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "duoshuo-ua",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "title": "Duoshuo UA Plugin",
   "description": "Plugin of duoshuo to show operating systems and browsers for duoshuo comments.",
   "author": "Gerald <gera2ld@163.com>",
@@ -13,16 +13,16 @@
     "url": "https://github.com/gera2ld/duoshuo-ua/issues"
   },
   "devDependencies": {
-    "gulp": "^3.8.11",
+    "gulp": "^3.9.0",
     "gulp-clone": "^1.0.0",
-    "gulp-concat": "^2.5.2",
+    "gulp-concat": "^2.6.0",
     "gulp-css2js": "^1.0.2",
-    "gulp-header": "^1.2.2",
-    "gulp-merge": "^0.1.0",
-    "gulp-minify-css": "^0.4.4",
+    "gulp-header": "^1.7.1",
+    "gulp-minify-css": "^1.2.1",
     "gulp-order": "^1.1.1",
-    "gulp-rename": "^1.2.0",
-    "gulp-uglify": "^1.1.0",
-    "gulp-wrap": "^0.10.1"
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^1.4.2",
+    "gulp-wrap": "^0.11.0",
+    "merge2": "^0.3.6"
   }
 }

src/core.js

@@ -13,15 +13,26 @@ function emptyString(local) {
 	return '';
 }
 
+var myIds;
 function callBefore(local, args) {
-	var myIds = duoshuoQuery.myIds || [];
+  if (!myIds) {
+    myIds = duoshuoQuery.myIds || [];
+    if (!myIds.slice) myIds = [myIds];
+    myIds.reverse();
+  }
+
 	var e = args[0];
 	if (args.length == 1)	// embed.unstable.js
 		e = e.post;
+
 	local.agent = e.agent;
+  local.webmaster = 0;
 	var id = e.author_id;
-	if (!myIds.pop) myIds = [myIds];
-	local.webmaster = myIds.indexOf(id) < 0 ? 0 : id;
+  for (var i = myIds.length; i--; )
+    if (myIds[i] == id) {
+      local.webmaster = id;
+      break;
+    }
 }
 
 function callAfter(local, args) {